apply-clients 7.1.35 → 7.1.36-1

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

@@ -1,12 +1,13 @@
 <template>
   <div class="auto clearfix">
-    <show-back-reason :selectdata="data"></show-back-reason>
+    <show-back-reason :selectdata="show_data"></show-back-reason>
   </div>
-  <service-view v-ref:service_show :data="data" v-if="showview"></service-view>
+  <service-view v-ref:service_show :data="show_data" v-if="showview"></service-view>
 </template>
 <script>
   import Vue from 'vue'
   import {HttpResetClass} from 'vue-client'
+  import {isEmpty} from "../../../Util";
   // Date格式化
   Date.prototype.Format = function (fmt) {
     var o = {
@@ -39,58 +40,59 @@
       return {
         data: null,    // 展示的数据
         json_datas: null, // json配置数据结构
-        showview: false // 控制显示层显示
+        showview: false, // 控制显示层显示
+        show_data: null
       }
     },
     created () {
-      this.initial()
+      this.refurbish()
     },
     methods: {
       // 初始化模块
-      async initial() {
-        this.showview = false
+      async refurbish() {
         this.json_datas = this.$workflow_vue
         let sum = 0
         let jsonData = {}
+        if (!this.json_datas || !this.json_datas.activitys || this.json_datas.activitys.length === 0) {
+          this.$showMessage("网络故障，请刷新页面")
+          return
+        }
         this.json_datas.activitys.forEach(item => {
           if (this.selectdata.defname === item.title) {
-            jsonData = item
-            sum++
+            jsonData = item  // 拿到当前节点的json配置信息
+            sum++ // 节点名一样的个数
           }
+          return this.selectdata.defname === item.title // 拿到当前节点的json配置信息
         })
         if (sum === 0) {
           this.$showMessage(`没有在JSON配置文件中找到活动名为:(${this.selectdata.defname})的节点配置`)
           return
         }
-        if (sum === 1) {
-          this.data = jsonData
-          this.data = Object.assign({}, this.data, this.selectdata)
-
-          await this.initializtion()
-          this.showview = true
+        if (sum > 1) {
+          this.$showMessage(`在JSON配置文件中找到活动名为:(${this.selectdata.defname})的节点配置:${sum}个`)
           return
         }
-        this.$showMessage(`在JSON配置文件中找到活动名为:(${this.selectdata.defname})的节点配置:${sum}个`)
-      },
-      // json配置数据处理
-      async initializtion() {
-        this.data.fields.forEach(item => {
 
+        this.data = null
+        this.data = jsonData
+        this.data = Object.assign({}, this.data, this.selectdata)
+
+        // fields 字段填充值
+        for (const item of this.data.fields) {
           if (this.selectdata[item.field]) {
             item.value = this.selectdata[item.field]
           }
           if (this.selectdata[item.field] === 0) {
-            item.value = this.selectdata[item.field]
+            item.value = 0
           }
-
-          // 如果配置类型为select,获取options
-          if(item.type==='select'){
-            item.options=[]
-          }
-          if (typeof item.value === 'string' && item.value.startsWith("{") && item.value.endsWith("}")) {
-            item.value = JSON.parse(item.value)
+          item.readonly = true
+          item.disabled = true
+          if (item.logo) {
+            if (item.ready) {
+              item.options = await this[item.ready]()
+            }
           }
-        })
+        }
 
         // 控制组件
         if (this.data.components) {
@@ -99,40 +101,71 @@
           })
         }
 
-
         // onetomany 数据获取
         if (this.data.onetomany) {
-          for (let index = 0; index < this.data.onetomany.length; index++) {
-            let http = new HttpResetClass()
-            let data = {
-              tablename: this.data.onetomany[index].tables[0],
-              condition: `f_process_id='${this.selectdata.f_process_id}'`
-            }
-
-            let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
-              resolveMsg: null,
-              rejectMsg: 'onetomany查询失败'
-            })
-
-            // 初始化 onetomany
-            this.data.onetomany[index].rows = res.data
-
-            // 初始化onetomany中的fields
-            for (let j = 0; j < this.data.onetomany[index].fields.length; j++) {
-              // 如果配置类型为select,优先从参数列表获取options
-              if (this.data.onetomany[index].fields[j].type === 'select') {
-                let temp = Vue.$appdata.getParam(this.data.onetomany[index].fields[j].label)
-                if (temp && temp.length > 0) {
-                  this.data.onetomany[index].fields[j].options = Vue.$appdata.getParam(this.data.onetomany[index].fields[j].label)
-                }
+          for (const item of this.data.onetomany) {
+            let res = null
+            if (item.queryEvent) {
+              res = this[item.queryEvent]()
+            } else {
+              let data = {
+                tablename: item.tables[0],
+                condition: `f_process_id='${this.selectdata.f_process_id}'`
               }
+              res = await this.$resetpost(
+                'rs/sql/applySingleTable',
+                {data: data},
+                {resolveMsg: null, rejectMsg: 'onetomany查询失败'}
+              )
             }
+
+            item.rows = res.data
+
+            // 隐藏所有操作
+            item.hiddenOperate = true
           }
         }
+
         // 去除button
         this.data.buttons = null
 
+        // 完成时间和完成人,部门，分公司
+        if (this.selectdata.state === '结束') {
+          this.data.operate_date = new Date(this.selectdata.finishtime).Format('yyyy-MM-dd')
+          this.data.operator = this.selectdata.person
+
+          let http = new HttpResetClass()
+          try {
+            let res = await http.load('POST', 'rs/search', {
+              source: 'this.getInfo()',
+              userid: this.selectdata.userid
+            }, {resolveMsg: null, rejectMsg: null})
+            let user = res.data
+            this.data.orgs = user.orgs
+            this.data.parentname = user.deps
+          } catch (e) {
+            this.data.orgs = this.$login.f.orgs
+            this.data.parentname = this.$login.f.deps
+          }
+        }
+          if (this.selectdata.f_apply_nature === '散户') {
+            this.hideLabels('营业执照', '小区')
+            this.electiveLabels('营业执照', '购货单位识别号', '购货单位银行账号', '购货单位地址电话', '小区')
+          }
+          if (this.selectdata.f_apply_nature === '小区') {
+            this.showLabels('营业执照', '小区', '小区名称')
+            this.requiredLabels( '小区')
+          }
+        // 消除双向绑定，避免子组件（显示层）数据更改，父组件（控制层）也更改
+        let temp = JSON.parse(JSON.stringify(this.data))
 
+        this.show_data = temp
+        this.$nextTick(() => {
+          this.showview = true
+        })
+      },
+      // json配置数据处理
+      async initializtion() {
         // 查询是否有当前节点快照信息,如果有使用快照数据，没有则展示最新数据
         if (this.nodeSnapshot && this.data.nodeSnapshot) {
           let http = new HttpResetClass()
@@ -140,7 +173,7 @@
             tablename: 't_node_snapshot',
             condition: `actid = '${this.selectdata.actid}' and f_process_id='${this.selectdata.f_process_id}'`
           }
-          let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
+          let res = await http.load('POST', 'rs/sql/applySingleTable', {data: data}, {
             resolveMsg: null,
             rejectMsg: null
           })
@@ -152,36 +185,355 @@
             this.data.title = data.title
           }
         }
+      },
+      hideLabels(...labels) {
+        console.log('报建性质1')
+        for (const item of this.data.fields) {
+          if (labels.includes(item.label)) {
+            item.hidden = true
+          }
+        }
+      },
+      electiveLabels(...labels) {
+        console.log('报建性质2')
+        for (const item of this.data.fields) {
+          if (labels.includes(item.label)) {
+            item.required = false
+          }
+        }
+      },
+      showLabels(...labels) {
+        console.log('报建性质3')
+        for (const item of this.data.fields) {
+          if (labels.includes(item.label)) {
+            item.hidden = false
+          }
+        }
+      },
+      requiredLabels(...labels) {
+        console.log('报建性质4')
+        for (const item of this.data.fields) {
+          if (labels.includes(item.label)) {
+            item.required = true
+          }
+        }
+      },
+      setLabelOptions(label, options) {
+        for (const item of this.show_data.fields) {
+          if (item.label === label) {
+            item.options = options
+          }
+        }
+      },
+      // 获取小区
+      async getResidentialArea () {
+        let data = {
+          tablename: 't_area_address',
+          condition: `f_filiale = '${this.$login.f.f_fengongsi}' and f_area_status = '启用'`
+        }
+        let http = new HttpResetClass()
+        let res = await http.load(
+          'POST',
+          `rs/sql/applySingleTable`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: '小区查询失败！！！'}
+        )
+        return res.data.map(item => {
+          return {
+            label: item.f_residential_area,
+            value: item.id
+          }
+        })
+      },
+      // 获取气表品牌
+      async getMeterBrand () {
+        let data = {
+        }
 
+        let http = new HttpResetClass()
+        let res = await http.load(
+          'POST',
+          `rs/sql/getMeterBrand`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: '气表品牌查询失败！！！'}
+        )
 
-        // 将所有field都不可修改，不可操作
-        this.data.fields.forEach(item => {
-          item.readonly = true
-          item.disabled = true
+        return res.data
+      },
+      async meterBrandChenge (index) {
+        if (isEmpty(this.selectdata.f_meter_brand)) {
+          console.log("测试无表具")
+          return
+        }
+        let data = {
+          f_gasbrand_id: this.selectdata.f_meter_brand
+        }
+        let http = new HttpResetClass()
+        let res = await http.load(
+          'POST',
+          `rs/sql/getGasModel`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: '气表型号查询失败！！！'}
+        )
+        console.log("测试有表具",res.data)
+        return res.data
+      },
+      async getUserName() {
+        console.log('用户姓名查询')
+        if(this.selectdata.f_construction_unit_id){
+          let data = {
+            tablename: 't_user',
+            condition: `id='${this.selectdata.f_construction_unit_id}'`
+          }
+          let res = await this.$resetpost(
+            'rs/sql/applySingleTable',
+            {data: data},
+            {resolveMsg: null, rejectMsg: null}
+          )
+          return res.data.map(item => {
+            return {
+              label: item.name,
+              value: item.id
+            }
+          })
+        }
+        return
+      },
+      async getConstructionWorker(){
+        let data = {
+          source: 'this.getParentByType($organization$).getChildByName($建设单位$).getChildren()',
+          userid: this.$login.f.id
+        }
+
+        let res = await this.$resetpost(
+          `${this.$androidUtil.getProxyUrl()}/rs/search`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: '现场负责人查询失败！！！'}
+        )
+
+        return res.data.map(item => {
+          return {
+            label: item.name,
+            value: item.id
+          }
         })
-        // 去除所有onetomany的操作
-        if (this.data.onetomany) {
-          this.data.onetomany.forEach(item => {
-            item.hiddenOperate = true
+      },
+      // 安装单位签字人
+      async getConstructionUnitId () {
+        if (this.selectdata.f_construction_unit_id){
+          let data = {
+            tablename: 't_user',
+            condition: `id='${this.selectdata.f_construction_unit_id}'`
+          }
+          let res = await this.$resetpost(
+            'rs/sql/applySingleTable',
+            {data: data},
+            {resolveMsg: null, rejectMsg: null}
+          )
+          return res.data.map(item => {
+            return {
+              label: item.name,
+              value: item.id
+            }
           })
         }
+      },
+      // 安装单位负责人
+      async getConstructionUnit () {
+        let data = {
+          source: 'this.getParentByType($organization$).getChildByName($工程施工队$).getChildren()',
+          userid: this.$login.f.id
+        }
 
-        // 完成时间和完成人,部门，分公司
-        if (this.selectdata.state === '结束') {
-          let http = new HttpResetClass()
-          let res = await http.load('POST', 'rs/search', {
-            source: 'this.getInfo()',
-            userid: this.selectdata.userid
-          }, {resolveMsg: null, rejectMsg: null})
-          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.f_filiale = user.orgs
-          this.data.f_parentname = user.deps
+        let res = await this.$resetpost(
+          'rs/search',
+          {data: data},
+          {resolveMsg: null, rejectMsg: '安装单位负责人查询失败！！！'}
+        )
+
+        return res.data.map(item => {
+          return {
+            label: item.name,
+            value: item.id
+          }
+        })
+      },
+      // 建设单位
+      async getConstructOperator () {
+        let data = {
+          source: 'this.getParentByType($organization$).getChildByName($建设单位$).getChildren()',
+          userid: this.$login.f.id
+        }
+
+        let res = await this.$resetpost(
+          'rs/search',
+          {data: data},
+          {resolveMsg: null, rejectMsg: '建设单位人员查询失败！！！'}
+        )
+
+        return res.data.map(item => {
+          return {
+            label: item.name,
+            value: item.id
+          }
+        })
+      },
+      // 监理单位
+      async getSupervisorOperator () {
+        let data = {
+          source: 'this.getParentByType($organization$).getChildByName($监理单位$).getChildren()',
+          userid: this.$login.f.id
+        }
+
+        let res = await this.$resetpost(
+          'rs/search',
+          {data: data},
+          {resolveMsg: null, rejectMsg: '监理单位人员查询失败！！！'}
+        )
+        return res.data.map(item => {
+          return {
+            label: item.name,
+            value: item.id
+          }
+        })
+      },
+      // 监理现场负责人
+      async getSupervisorOperatorId () {
+        let data = {
+          source: 'this.getParentByType($organization$).getChildByName($监理班组$).getChildren()',
+          userid: this.$login.f.id
+        }
+        let res = await this.$resetpost(
+          'rs/search',
+          {data: data},
+          {resolveMsg: null, rejectMsg: '监理单位人员查询失败！！！'}
+        )
+        return res.data.map(item => {
+          return {
+            label: item.name,
+            value: item.id
+          }
+        })
+      },
+      // 土建单位
+      async getEngineeringOperator () {
+        let data = {
+          source: 'this.getParentByType($organization$).getChildByName($土建单位$).getChildren()',
+          userid: this.$login.f.id
+        }
+
+        let res = await this.$resetpost(
+          'rs/search',
+          {data: data},
+          {resolveMsg: null, rejectMsg: '土建单位人员查询失败！！！'}
+        )
+        let result = res.data.map(item => {
+          return {
+            label: item.name,
+            value: item.id
+          }
+        })
+        if(this.selectdata.f_apply_nature === '散户'){
+          result.push({label:'用户自理',value:'用户自理'})
+        }
+        result.push({label:'无',value:'无'})
+        return result
+      },
+      // 检测单位
+      async getCheckOperator () {
+        let data = {
+          source: 'this.getParentByType($organization$).getChildByName($检测单位$).getChildren()',
+          userid: this.$login.f.id
+        }
+
+        let res = await this.$resetpost(
+          'rs/search',
+          {data: data},
+          {resolveMsg: null, rejectMsg: '检测单位人员查询失败！！！'}
+        )
+
+        let result = res.data.map(item => {
+          return {
+            label: item.name,
+            value: item.id
+          }
+        })
+        result.push({label:'无',value:'无'})
+        return result
+      },
+      // 户内出单日期
+      async getOutdoorsTime () {
+        for (const item of this.data.fields) {
+          if (item.label === '户内出单日期') {
+            item.value = this.data.f_release_date
+            this.data[item.field] = item.value
+          }else if(item.label === '庭院出单日期'){
+            item.value = this.data.f_release_date
+            this.data[item.field] = item.value
+          }
+        }
+      },
+      async getChargeDate() {
+        let data = {
+          tablename: 'activityins',
+          condition: `processid = '${this.data.f_process_id}' and defname = '报装缴费'`,
+        }
+
+        let http = new HttpResetClass()
+        let res = await http.load(
+          'POST',
+          `rs/sql/applySingleTable`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: null}
+        )
+        for (const item of this.data.fields) {
+          if (item.label === '缴费日期') {
+            item.value = res.data[0].finishtime
+            this.data[item.field] = item.value
+          }
+        }
+      },
+      async getSingAct() {
+        let data = {
+          f_process_id: this.data.f_process_id
+        }
+        let http = new HttpResetClass()
+        let res = await http.load(
+          'POST',
+          `rs/sql/getSingAct`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: '签字状态查询失败！！！'}
+        )
+        if (res.data.length > 0) {
+          for (const item of this.data.fields) {
+            if (item.label === '签字所在环节') {
+              item.value = res.data[0].defname
+              this.data[item.field] = item.value
+            }
+          }
         }
       }
     },
     events:{
+      // 工程派工初始化
+      async 'dispatchReadyEvent' () {
+        console.log("cscc")
+        if (isEmpty(this.show_data.f_meter_brand)) {
+          return
+        }
+        let data = {
+          f_gasbrand_id: this.show_data.f_meter_brand
+        }
+        let http = new HttpResetClass()
+        let res = await http.load(
+          'POST',
+          `rs/sql/getGasModel`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: '气表型号查询失败！！！'}
+        )
+
+        this.setLabelOptions('气表型号', res.data)
+      },
     },
     watch: {
       deep: true

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

@@ -5,17 +5,17 @@
         <supervisory-list v-ref:query :show-data="showData"></supervisory-list>
       </div>
       <div v-if="showtotal" style="height: 89%">
-        <div class="col-sm-2">
-          <supervisory-chart :selectdata="selectdata"></supervisory-chart>
+        <div class="col-sm-2" style="margin-top: 20px">
+          <new-supervisory-chart :selectdata="selectdata"></new-supervisory-chart>
         </div>
-        <div class="col-sm-10">
+        <div class="col-sm-10" style="margin-top: 20px">
           <tabset v-ref:tabs :close="false">
             <tab :header='selectdata.defname'>
               <supervisory-service-control :selectdata="selectdata" :node-snapshot="true"></supervisory-service-control>
             </tab>
             <tab header='附件'>
               <apply-upload :blodid="selectdata.f_process_id"
-                            :isupload = "false"
+                            :isupload = "projectStart"
                             :isdelete="false"
                             :isusetype="true"
                             :isremark = "true"
@@ -49,19 +49,17 @@
     methods: {
       // 获取页面配置json文件
       async loadName () {
-        let http = new HttpResetClass()
-        let xmldata = {
-          data: this.$login.f,
-          workname: this.xmlname
+        let data = {
+          workname: this.selectdata.processname
         }
-        let res = await http.load('POST', 'rs/logic/ApplyGetConfigs', {data: xmldata}, {resolveMsg: null, rejectMsg: null})
 
-        if (res.data.code && res.data.code === 200) {
-          Vue.prototype.$workflow_vue = res.data.workflow_vue
-        } else {
-          this.$showMessage('获取报建配置失败,原因:' + res.data.msg)
-          return
-        }
+        let res = await this.$resetpost(
+          'rs/logic/ApplyGetConfigs',
+          {data: data},
+          {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'}
+        )
+
+        Vue.prototype.$workflow_vue = res.data
       }
     },
     events: {
@@ -76,25 +74,6 @@
         this.selectdata = val
         this.showtotal = false
 
-        if (this.selectdata.f_apply_type === '开发商集体报装') {
-          this.xmlname = '开发商集体报建流程'
-        } else if (this.selectdata.f_apply_type === '散户报建') {
-          this.xmlname = '散户报建流程'
-        } else if (this.selectdata.f_apply_type === '工业户报装') {
-          this.xmlname = '工商户报建流程'
-        } else if (this.selectdata.f_apply_type === '商业户报建') {
-          this.xmlname = '工商户报建流程'
-        } else if (this.selectdata.f_apply_type === '工商户报装') {
-          this.xmlname = '工商户报建流程'
-        } else if (this.selectdata.f_apply_type === '散户集体报装') {
-          this.xmlname = '散户集体报建流程'
-        } else if (this.selectdata.f_apply_type === '煤改气报建') {
-          this.xmlname = '散户集体报建流程'
-        } else {
-          this.$showMessage('暂无此类报装')
-          return
-        }
-
         // 获取配置文件
         await this.loadName()
 
@@ -112,9 +91,23 @@
         this.$refs.query.$refs.cp.pager = true
         // 调用查询
         this.$refs.query.$refs.cp.$refs.cri.search()
+      },
+      'loadPage' () {
+        // 关闭详细
+        this.showtotal = false
+        // 显示列表数据
+        this.showData = true
+        // 显示分页
+        this.$refs.query.$refs.cp.pager = true
+        // 调用查询
+        this.$refs.query.$refs.cp.loadPage(this.$refs.query.model.pageIndex)
+      }
+    },
+    computed: {
+      projectStart () {
+        return this.$login.r.includes('报装文件上传')
       }
     },
-
     watch: {
     }
   }