apply-clients 3.3.29 → 3.3.33

package/src/components/product/Supervisory/Service/SupervisoryServiceControl.vue

@@ -65,6 +65,7 @@
           }
           return this.selectdata.defname === item.title // 拿到当前节点的json配置信息
         })
+
         if (sum === 0) {
           this.$showMessage(`没有在JSON配置文件中找到活动名为:(${this.selectdata.defname})的节点配置`)
           return
@@ -74,19 +75,40 @@
           return
         }
 
-        this.data = null
-        this.data = jsonData
-        this.data = Object.assign({}, this.data, this.selectdata)
+        this.selectdata = Object.assign({}, this.selectdata, jsonData)
 
         // fields 字段填充值
-        for (const item of this.data.fields) {
+        for (const item of this.selectdata.fields) {
+          if (!item.value) {
+            item.value = null
+          }
+
+          if (!item.value && (item.default || item.default === 0) && item.type !== 'datepicker') {
+            if (item.eval) {
+              item.value = eval(item.default)
+            } else {
+              item.value = item.default
+            }
+          }
+
           if (this.selectdata[item.field]) {
-            item.value = this.selectdata[item.field]
+            // 将json字符串格式化赋值给value
+            if (String(this.selectdata[item.field]).startsWith("{")) {
+              item.value = JSON.parse(this.selectdata[item.field])
+            } else {
+              item.value = this.selectdata[item.field]
+            }
           }
           if (this.selectdata[item.field] === 0) {
             item.value = 0
           }
 
+          // datepicker
+          if (item.type === 'datepicker' && !item.value && item.default) {
+            item.value = new Date().Format(`${item.format ? item.format : 'yyyy-MM-dd HH:mm:ss'}`)
+          }
+
+          // 如果配置类型为select,优先从参数列表获取options
           if (item.type === 'select' || item.type === 'checkbox') {
             if (item.param) {
               let temp = this.$appdata.getParam(item.label)
@@ -108,6 +130,7 @@
             }
           }
 
+
           if (item.type === 'checkbox') {
             if (this.selectdata[item.field]) {
               item.value = JSON.parse(this.selectdata[item.field])
@@ -116,20 +139,25 @@
             }
           }
 
+          this.selectdata[item.field] = item.value
+
           item.readonly = true
           item.disabled = true
         }
 
         // 控制组件
-        if (this.data.components) {
-          this.data.components.forEach(item => {
+        if (this.selectdata.components) {
+          this.selectdata.components.forEach(item => {
             item.mark = 1
+            if (item.supervisory) {
+              item.mark = 0
+            }
           })
         }
 
-        // onetomany 数据获取
-        if (this.data.onetomany) {
-          for (const item of this.data.onetomany) {
+        // 初始化onetomany
+        if (this.selectdata.onetomany) {
+          for (const item of this.selectdata.onetomany) {
             let res = null
             if (item.queryEvent) {
               res = this[item.queryEvent]()
@@ -147,13 +175,51 @@
 
             item.rows = res.data
 
+            // 初始化onetomany中的fields
+            for (const field of item.fields) {
+              if (!field.value) {
+                if (field.value !== 0) {
+                  field.value = null
+                }
+              }
+
+              if (field.default || field.default === 0) {
+                field.value = field.default
+              }
+
+              // datepicker
+              if (field.type === 'datepicker' && !field.value && field.default) {
+                field.value = new Date().Format(`${field.format ? field.format : 'yyyy-MM-dd HH:mm:ss'}`)
+              }
+
+              if (field.type === 'select') {
+
+                let temp = this.$appdata.getParam(field.label)
+
+                if (temp && temp.length > 0) {
+                  field.options = temp
+                }
+
+                if (field.paramLabel) {
+                  temp = this.$appdata.getParam(field.paramLabel)
+                  if (temp && temp.length > 0) {
+                    item.options = temp
+                  }
+                }
+
+              }
+            }
+
             // 隐藏所有操作
             item.hiddenOperate = true
+            if (item.supervisory) {
+              item.hiddenOperate = false
+            }
           }
         }
 
         // 去除button
-        this.data.buttons = null
+        this.selectdata.buttons = null
 
         // 完成时间和完成人,部门，分公司
         if (this.selectdata.state === '结束') {
@@ -163,10 +229,10 @@
             userid: this.selectdata.userid
           }, {resolveMsg: null, rejectMsg: '处理人员获取失败！！！'})
           let user = res.data
-          this.data.operate_date = new Date(this.selectdata.finishtime).Format('yyyy-MM-dd')
-          this.data.operator = this.selectdata.person
-          this.data.orgs = user.orgs
-          this.data.parentname = user.deps
+          this.selectdata.operate_date = new Date(this.selectdata.finishtime).Format('yyyy-MM-dd')
+          this.selectdata.operator = this.selectdata.person
+          this.selectdata.orgs = user.orgs
+          this.selectdata.parentname = user.deps
         }
 
         // 未结束且是下发查看指定人员
@@ -177,14 +243,14 @@
             userid: this.selectdata.actorexpression.substring(3, this.selectdata.actorexpression.length-1)
           }, {resolveMsg: null, rejectMsg: '处理人员获取失败！！！'})
           let user = res.data
-          this.data.operate_date = new Date().Format('yyyy-MM-dd')
-          this.data.operator = user.name
-          this.data.orgs = user.orgs
-          this.data.parentname = user.f_department_name
+          this.selectdata.operate_date = new Date().Format('yyyy-MM-dd')
+          this.selectdata.operator = user.name
+          this.selectdata.orgs = user.orgs
+          this.selectdata.parentname = user.f_department_name
         }
 
         // 消除双向绑定，避免子组件（显示层）数据更改，父组件（控制层）也更改
-        let temp = JSON.parse(JSON.stringify(this.data))
+        let temp = JSON.parse(JSON.stringify(this.selectdata))
 
         this.show_data = temp
         this.$nextTick(() => {
@@ -249,6 +315,50 @@
           }
         }
       },
+      showLabels(...labels) {
+        for (const item of this.show_data.fields) {
+          if (labels.includes(item.label)) {
+            item.hidden = false
+          }
+        }
+      },
+      hideLabels(...labels) {
+        for (const item of this.show_data.fields) {
+          if (labels.includes(item.label)) {
+            item.hidden = true
+          }
+        }
+      },
+      requiredLabels(...labels) {
+        for (const item of this.show_data.fields) {
+          if (labels.includes(item.label)) {
+            item.required = true
+          }
+        }
+      },
+      electiveLabels(...labels) {
+        for (const item of this.show_data.fields) {
+          if (labels.includes(item.label)) {
+            item.required = false
+          }
+        }
+      },
+      readonlyLabels(...labels) {
+        for (const item of this.show_data.fields) {
+          if (labels.includes(item.label)) {
+            item.readonly = true
+            item.disabled = true
+          }
+        }
+      },
+      readwriteLabels(...labels) {
+        for (const item of this.show_data.fields) {
+          if (labels.includes(item.label)) {
+            item.readonly = false
+            item.disabled = false
+          }
+        }
+      },
       async checkDuplicate(index) {
         let http = new HttpResetClass()
         let data = {
@@ -383,6 +493,40 @@
       }
     },
     events:{
+      // 选择材料
+      async materialNameChenge (index, fieldIndex) {
+        let material = this.show_data.onetomany[index].fields[fieldIndex].value
+
+        this.show_data.onetomany[index].fields.forEach(item => {
+          if (material[item.field]) {
+            item.value = material[item.field]
+          }
+        })
+      },
+      // 打开模态框获取材料
+      async 'getMaterialName' (index) {
+        let data = {
+          condition: `1=1`
+        }
+        let http = new HttpResetClass()
+        let res = await http.load(
+          'POST',
+          `rs/sql/getApplyMaterial`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: '材料查询失败！！！'}
+        )
+
+        this.show_data.onetomany[index].fields.forEach(field => {
+          if (field.label === '选择材料') {
+            field.options = res.data.map(item => {
+              return {
+                'label': `${item.f_material_name}--${item.f_material_style}--${item.f_material_unit}`,
+                'value': item
+              }
+            })
+          }
+        })
+      },
       // 终止报建初始化·
       async 'stopApplyReadyEvent' () {
 
@@ -509,6 +653,134 @@
           }
         }
       },
+      // 失去焦点出触发事件
+      'onchange' (index) {
+        if (this.show_data.defname === '报装申请' || this.show_data.defname === '信息确认') {
+          if (
+            this.show_data.fields[index].label === '区/县' ||
+            this.show_data.fields[index].label === '街道/乡镇' ||
+            this.show_data.fields[index].label === '集收单位' ||
+            this.show_data.fields[index].label === '楼号/组' ||
+            this.show_data.fields[index].label === '单元/排' ||
+            this.show_data.fields[index].label === '楼层' ||
+            this.show_data.fields[index].label === '门牌号'
+          ) {
+
+            let f_pcd = this.getLableValue('区/县') || ''
+            let f_street = this.getLableValue('街道/乡镇') || ''
+            let f_residential_area = this.getLableValue('集收单位') || ''
+            let f_building = this.getLableValue('楼号/组') || ''
+            let f_building_suffix = f_building ? this.config.f_building_suffix : ''
+            let f_unit = this.getLableValue('单元/排') || ''
+            let f_unit_suffix = f_unit ? this.config.f_unit_suffix : ''
+            let f_floor = this.getLableValue('楼层') || ''
+            let f_floor_suffix = f_floor ? this.config.f_floor_suffix : ''
+            let f_room = this.getLableValue('门牌号') || ''
+            let f_room_suffix = f_room ? this.config.f_room_suffix : ''
+
+            let f_address = f_pcd + f_street + f_residential_area + f_building + f_building_suffix + f_unit + f_unit_suffix + f_floor + f_floor_suffix + f_room + f_room_suffix
+            this.setLabelValue("地址", f_address)
+          }
+        }
+      },
+      // =============================
+      selectSearch (val, index) {},
+      'onblur' (index) {},
+      'oninput' (index) {},
+      'initializtionView' () {},
+      async 'onchangeModal' (index, fieldIndex) {
+      },
+      async 'onblurModal' (index, fieldIndex) {
+
+      },
+      async 'oninputModal' (index, fieldIndex) {
+
+      },
+      async 'onetomanydelete' (index, rowIndex) {
+
+        let http = new HttpResetClass()
+
+        let res = await http.load(
+          'DELETE',
+          `rs/entity/${this.show_data.onetomany[index].tables[0]}/${this.show_data.onetomany[index].rows[rowIndex].id}`,
+          null,
+          {resolveMsg: null, rejectMsg: '删除失败！！！'}
+        )
+
+        res = await this.$resetpost(
+          'rs/entity/t_apply',
+          this.show_data
+        )
+
+        this.$dispatch('breakControl', this.show_data)
+      },
+      async 'onetomanyupdate' (index, rowIndex) {
+        let data = this.show_data.onetomany[index].rows[rowIndex]
+
+        this.show_data.onetomany[index].fields.forEach(item => {
+          data[item.field] = item.value
+        })
+        let res = await this.$resetpost(
+          `rs/entity/${this.show_data.onetomany[index].tables[0]}`,
+          data
+        )
+
+        res = await this.$resetpost(
+          'rs/entity/t_apply',
+          this.show_data
+        )
+
+        this.$dispatch('breakControl', this.show_data)
+      },
+      async 'onetomanyadd' (index) {
+        let data = {
+          f_process_id : this.show_data.f_process_id,
+          f_operator_id: this.$login.f.id,
+          f_operator: this.$login.f.name,
+          f_operation_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
+          f_orgid: this.$login.f.orgid,
+          f_orgname: this.$login.f.orgs
+        }
+        this.show_data.onetomany[index].fields.forEach(item => {
+          data[item.field] = item.value
+        })
+        let res = await this.$resetpost(
+          `rs/entity/${this.show_data.onetomany[index].tables[0]}`,
+          data
+        )
+
+        res = await this.$resetpost(
+          'rs/entity/t_apply',
+          this.show_data
+        )
+
+        this.$dispatch('breakControl', this.show_data)
+      },
+      async 'importEvent' (index, table, configName, filepath) {
+        let data = {
+          selectdata: this.show_data,
+          table: table,
+          filepath: filepath,
+          configName: configName,
+          user: this.$login.f
+        }
+
+        let res = await this.$resetpost(
+          `rs/logic/importEvent`,
+          data
+        )
+
+        this.$dispatch('breakControl', this.show_data)
+      },
+      'onbutchange' (index) {
+
+      },
+      'onbutblur' (index) {
+
+      },
+      'onbutinput' (index) {
+
+      }
     },
     watch: {
       deep: true

package/src/components/product/Supervisory/SupervisoryControl.vue

@@ -63,6 +63,32 @@
       }
     },
     events: {
+      // 刷新控制层
+      async 'breakControl' (servicedata) {
+
+        if (servicedata.id) {
+          let data = {
+            condition: `u.id = ${servicedata.id}`,
+            data: {
+              orgid: this.$login.f.orgid
+            }
+          }
+          let res = await this.$resetpost(
+            'rs/sql/supervisory',
+            {data: data},
+            {resolveMsg: null, rejectMsg: '数据更新失败，请手查询更新！！！'}
+          )
+          this.selectdata = Object.assign({}, this.selectdata, res.data[0])
+        } else {
+          this.selectdata = servicedata
+        }
+
+        this.showtotal = false
+        this.$nextTick(() => {
+          this.showtotal = true
+        })
+
+      },
       'onMessage' (data) {
         console.log('接收消息')
         console.log(data)
@@ -71,6 +97,7 @@
         }
       },
       async 'apply' (val) {
+        this.selectdata = null
         this.selectdata = val
         this.showtotal = false
 

package/src/components/product/Supervisory/SupervisoryhCart.vue

@@ -55,7 +55,7 @@
         //   return
         // }
         // this.$showMessage("对不起，您没有查看此节点的权限！")
-
+        delete row.id
         row = Object.assign({},this.selectdata,row)
         this.$dispatch('apply', row)
       },