system-clients 3.2.98-temp → 3.2.99-temp

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-clients",
-  "version": "3.2.98-temp",
+  "version": "3.2.99-temp",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {

package/src/filiale/bayan/PosAdd.vue

@@ -7,8 +7,17 @@
       <form novalidate class="form-horizontal" >
         <div class="row">
           <div class="col-sm-6  form-group">
-            <label class="font_normal_body">&ensp;公&emsp;&emsp;司&ensp;</label>
-            <right-tree @re-res="getRes1"></right-tree>
+            <label class="font_normal_body">&ensp;所属公司&ensp;</label>
+            <right-tree @re-res="getOrg"></right-tree>
+          </div>
+          <div class="col-sm-6 form-group">
+            <label class="font_normal_body">所属部门</label>
+            <res-select restype='department'
+                        :is-mul="false"
+                        @res-select="getDep"
+                        :parentresid="depresid"
+                        :initresid="initresid">
+            </res-select>
           </div>
           <div class="col-sm-6 form-group">
             <label class="font_normal_body">设备负责人</label>
@@ -65,16 +74,6 @@
                       close-on-select clear-button>
             </v-select>
           </div>
-          <div class="col-sm-6 form-group">
-            <label class="font_normal_body">所属部门</label>
-            <res-select restype='department'
-                        :is-mul="false"
-                        @res-select="getdep"
-                        :parentresid="depresid"
-                        :initresid="initresid">
-            </res-select>
-          </div>
-
         </div>
         <div class="col-sm-12 form-group" :class="{'has-error': $v.f_address.required}">
           <label class="font_normal_body">&ensp;放置地点&ensp;</label>
@@ -145,7 +144,7 @@ export default {
       orgname: '',
       initresid: [], // 用于存放初始化选中的部门 ID
       initresids: [],
-      depresid: [this.$login.f.depids],
+      depresid: [this.$login.f.orgid],
       depid: [this.f_depid],
       f_orgid: this.$login.f.orgid,
       userresid: [this.$login.f.id],
@@ -213,16 +212,19 @@ export default {
   },
 
   methods: {
-    getRes1 (obj) {
-      this.orgname = obj.res[0]
+    getOrg (obj, val) {
+      console.log('org', obj, val)
+      this.model.f_orgname = obj.res[0]
       this.depresid = obj.resids
-      this.f_orgid = obj.resids
-      this.userresid = obj.resids
+      this.model.f_orgid = obj.resids[0]
+      console.log(this.model)
     },
-    getdep (obj, val) {
-      this.depname = val
-      // this.userresid = obj
-      this.f_depid = obj
+    getDep (obj, val) {
+      console.log('dep', obj, val)
+      this.model.f_depname = val[0]
+      this.userresid = obj
+      this.model.f_depid = obj[0]
+      console.log(this.model)
     },
     recursiveSelOrg(val, flag){
       if(val.parent){
@@ -239,12 +241,12 @@ export default {
       console.log('====================', val)
       if (val.orgobj.length === 1 && val.orgobj[0].resourcetype === 'user'){
 
-        let org = this.recursiveSelOrg(val.orgobj[0], 'organization')
-        this.model.f_orgid=org.id
-        this.model.f_orgname=org.name
-        let dep = this.recursiveSelOrg(val.orgobj[0], 'department')
-        this.model.f_depid=dep.id
-        this.model.f_depname=dep.name
+        // let org = this.recursiveSelOrg(val.orgobj[0], 'organization')
+        // this.model.f_orgid=org.id
+        // this.model.f_orgname=org.name
+        // let dep = this.recursiveSelOrg(val.orgobj[0], 'department')
+        // this.model.f_depid=dep.id
+        // this.model.f_depname=dep.name
 
         this.model.f_operatorid = val.orgobj[0].userid
         this.model.f_operator=val.orgobj[0].name
@@ -311,18 +313,19 @@ export default {
     },
     confirm () {
       // 如果是修改的话，只修改页面上用户填写的信息
-      this.model.f_depname = this.depname[0]
-      this.model.f_depid = this.f_depid[0]
       if (!this.info) {
+        this.model.f_user_depname = this.$login.f.deps
+        this.model.f_user_depid = this.$login.f.depids
         this.model.f_online = '离线'
-        this.model.f_operator = this.$login.f.name
-        this.model.f_orgid = this.$login.f.orgid
+        this.model.f_user_operator = this.$login.f.name
+        this.model.f_user_orgid = this.$login.f.orgid
         this.model.f_filialeids = this.$login.f.orgid
-        this.model.f_operatorid = this.$login.f.id
-        this.model.f_orgname = this.$login.f.orgs
+        this.model.f_user_operatorid = this.$login.f.id
+        this.model.f_user_orgname = this.$login.f.orgs
         // this.model.f_depname=this.depname[0]
         this.model.f_orgstr = this.$login.f.fullids
       }
+      console.log(this.model)
       this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
         this.$dispatch('refresh')
       }).catch((error) => {

package/src/filiale/bayan/PosList.vue

@@ -128,7 +128,7 @@
             <!--            <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_appVer}}</td>-->
             <!--            <td style="text-align:center;white-space:nowrap;" >{{row.f_username}}</td>-->
             <td style="text-align:center;white-space:nowrap;">{{row.f_comments}}</td>
-            <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_operator}}</td>
+            <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_user_operator}}</td>
             <td style="text-align:center;white-space:nowrap;" >{{row.isunknown}}</td>
             <td style="text-align:center">
               <button class="btn btn-danger"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>