apply-clients 3.0.4 → 3.0.5-ys

package/src/components/product/Statistics/ApplyStatisticsROOT.vue

@@ -0,0 +1,27 @@
+<template>
+    <
+</template>
+
+<script>
+    export default {
+      name: "报装统计根源目录",
+      data(){
+          return{
+
+          }
+      },
+      created(){
+
+      },
+      methods:{
+
+      },
+      events:{
+
+      }
+    }
+</script>
+
+<style scoped>
+
+</style>

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

@@ -1,65 +1,289 @@
 <template>
-  <service-view :data="data" v-if="showview"></service-view>
+  <div class="auto col-sm-12">
+    <show-back-reason class="auto col-sm-7"  v-if="selectdata.f_back_reason && selectdata.f_back_reason!=''"
+                      :data="show_data"></show-back-reason>
+    <div class="auto col-sm-7" v-if="!(selectdata.f_back_reason && selectdata.f_back_reason!='')"></div>
+    <div class="auto col-sm-4" >
+      <p v-show="changeHistoryData.length>0" class="text-right" href="#" @click="searchChangeHistory"><a href="#">点我查看修改历史</a></p>
+    </div>
+  </div>
+  <!-- 燎原报建缴费 -->
+  <batch-pay :selectdata="selectdata" v-if="selectdata.defname=='报建缴费' && selectdata.f_apply_type=='新用户' && selectdata.f_roster == '有' || selectdata.defname=='核对' && selectdata.f_apply_type=='新用户' && selectdata.f_roster == '有'" v-ref:charge></batch-pay>
+  <!--<gas-stop v-if="selectdata.defname == '停气碰口'"></gas-stop>-->
+  <material-message v-if="selectdata.defname=='材料导入'" v-ref:material
+                    :selectdata="selectdata"
+                    :state="2"
+                    :edit="false" :showprint="showprint"></material-message>
+  <material-message v-if="selectdata.defname=='材料审核'" v-ref:material
+                    :selectdata="selectdata"
+                    :state="1"
+                    :edit="false"></material-message>
+<!--  <receive-batch v-if="selectdata.defname == '派工单'" :selectdata="selectdata" v-ref:receivebatch :showprint="showprint"></receive-batch>-->
+  <project-settlement v-if="selectdata.defname == '工程结算'" :selectdata="selectdata" :showprint="showprint"></project-settlement>
+  <installfee :infee="selectdata" :showfee='true' v-if="selectdata.defname == '通气条件确认'" :showprint="showprint"></installfee>
+  <buyer-message v-ref:buyermessagev :selectdata="selectdata" :state="1" :showprint="showprint"
+                 v-if="selectdata.defname == '收费'||selectdata.defname == '勘察初设'"></buyer-message>
+  <installfee :infee="selectdata" :showprint="showprint" v-if="selectdata.defname == '收费'"></installfee>
+  <service-view v-ref:service_show :data="data" v-if="showview" :showprint="showprint"></service-view>
+  <modal :show.sync="showChangeHistoryInfo" v-ref:modal backdrop="false">
+    <header slot="modal-header" class="modal-header">
+      <button type="button" class="close" @click="closeChangeHistoryInfo"><span>&times;</span></button>
+      <h4 class="modal-title">更改历史</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div class="col-sm-12 span recordTable" style="margin-top: 10px;min-height: 350px">
+        <apply-change-history v-if="showChangeHistoryInfo" :history_data = "changeHistoryData"></apply-change-history>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+    </footer>
+  </modal>
 </template>
 <script>
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
   export default {
     title: '报建监控控制层',
     props: ['selectdata'],
-    data () {
+    data() {
       return {
-        data:null,    // 展示的数据
-        json_datas:null, // json配置数据结构
-        showview:false // 控制显示层显示
+        leijijiaofeijine:0,
+        showChangeHistoryInfo:false, // 历史数据模态框
+        changeHistoryData:[], // 修改历史数据处理
+        data: null,    // 展示的数据
+        json_datas: null, // json配置数据结构
+        showprint:false, // 监控界面不显示打印/冲正等
+        showview: false, // 控制显示层显示
+        show_data: {
+          f_back_reason: null,
+          f_back_date: null
+        },
+        f_filiale: null
       }
     },
     methods: {
+      hasChangeHistory(){
+        let http = new HttpResetClass()
+        let data = {
+          tablename: 't_apply_change_record',
+          condition: ` defname = '${this.selectdata.defname}' and f_process_id ='${this.selectdata.f_process_id}' and f_filiale = '${this.$login.f.f_fengongsi}'`
+        }
+        http.load('POST', 'rs/sql/singleTable', {data: data}, {resolveMsg: null, rejectMsg: "获取合同编号失败"}).then((res)=>{
+          this.changeHistoryData = []
+          this.changeHistoryData = res.data
+        })
+      },
+      // 查看修改历史记录
+      searchChangeHistory(){
+        console.log("查看修改历史记录")
+        this.showChangeHistoryInfo = true
+      },
+      // 关闭历史数据模态框
+      closeChangeHistoryInfo() {
+        this.showChangeHistoryInfo = false
+      },
+      getmodel(){
+        return this.$refs.service_show.getmodel()
+      },
       // json配置数据处理 比如下拉框的options
-      initializtion() {
+      async initializtion() {
         // selectdata 填充 data
-        this.data=Object.assign({},this.data,this.selectdata)
-        for(let i=0;i<this.data.fields.length;i++){
-          if(this.selectdata[this.data.fields[i].field]){
-            this.data.fields[i].value = this.selectdata[this.data.fields[i].field]
+        if (this.selectdata.f_survey_name) {
+          let buyerinfos = []
+          var numReg = /^[0-9]+$/
+          var numRe = new RegExp(numReg)
+          if (numRe.test(this.selectdata.f_survey_name)) {
+            let querydata = {
+              tablename: 't_user',
+              condition: `id = ${this.selectdata.f_survey_name}`
+            }
+            buyerinfos = await this.$resetpost('rs/sql/singleTable', {data: querydata}, {
+              resolveMsg: null,
+              rejectMsg: '获取人员失败'
+            })
+            this.selectdata.f_survey_name = {
+              id:buyerinfos.data[0].id,
+              name:buyerinfos.data[0].name
+            }
+          }
+        }
+
+        for (let i = 0; i < this.data.fields.length; i++) {
+
+          if(this.data.fields[i].label === '是否装新表'){
+            for(let k=0;k<this.data.fields.length;k++){
+              if(this.data.fields[i].value == '是'){
+                if(this.data.fields[k].label=='用气性质'||
+                  this.data.fields[k].label=='气价类型'||
+                  this.data.fields[k].label=='气价名称'
+                ){
+                  this.data.fields[k].required=true,
+                    this.data.fields[k].hidden=false
+                }
+              }else{
+                if(this.data.fields[k].label=='用气性质'||
+                  this.data.fields[k].label=='气价类型'||
+                  this.data.fields[k].label=='气价名称'){
+                  this.data.fields[k].required=false,
+                    this.data.fields[k].hidden=true
+                }
+              }
+            }
+          }
+          console.log("所属公司------5:" + this.selectdata.f_filiale)
+          // 燎原所属公司
+          // console.log("数据------------：" + JSON.stringify(this.selectdata))
+          // for (let i = 0; i < this.data.fields.length; i++) {
+          //
+          // }
+          // if(this.data.fields[i].label === '所属公司'){
+          //   this.data.fields[i].value = this.selectdata.f_filiale
+          //   console.log("所属公司------:" + this.selectdata.f_filiale)
+            // let http = new HttpResetClass()
+            // let data = {
+            //   tablename: 't_apply',
+            //   condition: "f_process_id = '" + this.data.f_process_id + "'"
+            // }
+            // await http.load('POST', 'rs/sql/applysingleTable', {data: data}, {resolveMsg: null, rejectMsg: '获取所属公司失败'})
+            //   .then((res) => {
+            //     this.data.fields[i].value =  res.data[0].f_filiale
+            //     this.json_datas.activitys.fields[i].value = res.data[0].f_filiale
+            //     console.log("所属公司：" + res.data[0].f_filiale)
+            //   })
+
+
+          // }
+
+          if(this.data.fields[i].label === '累计缴费金额'){
+            let http = new HttpResetClass()
+            let data = {
+              columnname: 'f_charge_money',
+              tablename: 't_charge_record',
+              condition: `f_charging_status='有效' and f_process_id = '${this.selectdata.f_process_id}'`
+            }
+            let res = await http.load('POST', 'rs/sql/getSum', {data: data}, {resolveMsg: null, rejectMsg: '获取缴费金额获取失败'})
+            this.data.fields[i].value = res.data[0].f_charge_money
+            this.leijijiaofeijine = res.data[0].f_charge_money
+            for (let k = 0; k < this.data.fields.length; k++) {
+              if(this.data.fields[k].label=='未结总金额'){
+                this.data.fields[k].value= Number(this.selectdata.f_contract_money) - this.data.fields[i].value
+                console.log(this.data.fields[k].label,this.data.fields[k].value)
+              }
+            }
+            console.log(this.data.fields[i].label,this.data.fields[i].value)
+          }
+          if(this.data.fields[i].label === '累计开票金额'){
+            let http = new HttpResetClass()
+            let data = {
+              columnname: 'f_charge_money',
+              tablename: 't_charge_record',
+              condition: `f_charging_status='有效' and f_process_id = '${this.selectdata.f_process_id}' and (f_invoice_num !='' or f_invoice_num is not null)`
+            }
+            let res = await http.load('POST', 'rs/sql/getSum', {data: data}, {resolveMsg: null, rejectMsg: '获取累计缴费金额获取失败'})
+            this.data.fields[i].value =  res.data[0].f_charge_money
+            for (let k = 0; k < this.data.fields.length; k++) {
+              if(this.data.fields[k].label=='未开票金额'){
+                this.data.fields[k].value= Number(this.leijijiaofeijine) - res.data[0].f_charge_money
+                console.log(this.data.fields[k].label,this.data.fields[k].value)
+                console.log("this.data.fields1",this.data.fields)
+              }
+            }
+            console.log(this.data.fields[i].label,this.data.fields[i].value)
+            console.log("this.data.fields",this.data.fields)
+          }
+          //施工环节 如果是个人报建需要提交表具信息
+          // 如果安装户数为1,则显示是否有表选项
+          if (this.data.defname === '施工'||this.data.defname === '通气') {
+            for (let i = 0; i < this.data.fields.length; i++) {
+              if(this.data.f_install_num != 1&&this.data.fields[i].label=='是否有表'){
+                this.data.fields[i].hidden = true
+                this.data.fields[i].required = false
+              }
+            }
+          }
+
+
+          //通气环节可以调出施工环节的表信息来修改
+          if (this.data.defname == '通气'||this.data.defname == '施工') {
+            for (let i = 0; i < this.data.fields.length; i++) {
+              if (this.data.fields[i].label === '气表品牌'
+                || this.data.fields[i].label === '气表型号'
+                || this.data.fields[i].label === '表号'
+                || this.data.fields[i].label === '通气表号'
+                || this.data.fields[i].label === '左右表'
+                || this.data.fields[i].label === '气表厂家') {
+                if (this.data.f_install_num == 1&&this.selectdata.f_hasmeter&&this.selectdata.f_hasmeter=='是') {
+                  this.data.fields[i].hidden = false
+                  this.data.fields[i].required = true
+                }else if(this.data.f_install_num == 1&&this.selectdata.f_hasmeter&&this.selectdata.f_hasmeter=='否'){
+                  this.data.fields[i].hidden = true
+                  this.data.fields[i].required = false
+                }
+              }else if(this.data.fields[i].label === '气表品牌id'||this.data.fields[i].label === '气表型号id'){
+                this.data.fields[i].hidden = true
+                this.data.fields[i].required = false
+              }
+            }
           }
           // 如果配置类型为select,获取options
           if(this.data.fields[i].type==='select'){
-            this.data.fields[i].options=this.$appdata.getParam(this.data.fields[i].label)
+            this.data.fields[i].options=[]
+          }
+          if (typeof this.data.fields[i].value === 'string' && this.data.fields[i].value.startsWith("{") && this.data.fields[i].value.endsWith("}")) {
+            this.data.fields[i].value = JSON.parse(this.data.fields[i].value)
           }
           // 将所有field都不可修改，不可操作
-          this.data.fields[i].readonly=true
-          this.data.fields[i].disabled=true
+          this.data.fields[i].readonly = true
+          this.data.fields[i].disabled = true
         }
         // 去除button
-        this.data.buttons=null
+        this.data.buttons = null
         // 完成时间和完成人,部门，分公司
-        this.data.filiale= this.selectdata.f_filiale
+        this.data.filiale = this.selectdata.f_filiale
         this.data.f_parentname = this.selectdata.f_parentname
         this.data.operate_date = this.selectdata.finishtime
         this.data.operator = this.selectdata.person
+        if (this.selectdata.f_back_reason) {
+          console.log("退回原因：" + this.selectdata.f_back_reason)
+          this.show_data.f_back_reason = this.selectdata.f_back_reason
+          this.show_data.f_back_date = this.selectdata.f_back_date
+        }
       }
     },
-    watch:{
+    events:{
+      'getmodel'(){
+        return this.$refs.service_show.getmodel()
+      },
+    },
+    watch: {
       'selectdata'() {
-        this.json_datas=this.$supervisory_vue
+        this.json_datas = this.$supervisory_vue
         let sum = 0
-        let jsonData ={}
-        for(let i=0;i<this.json_datas.activitys.length;i++){
-          if(this.selectdata.defname==this.json_datas.activitys[i].title){
+        let jsonData = {}
+        for (let i = 0; i < this.json_datas.activitys.length; i++) {
+          if (this.selectdata.defname == this.json_datas.activitys[i].title) {
             jsonData = this.json_datas.activitys[i]
             sum++
           }
         }
-        if(sum==1){
+        if (sum == 1) {
           this.data = jsonData
+          this.data = Object.assign({}, this.data, this.selectdata)
+          for(let i = 0; i < this.data.fields.length; i++){
+            if (this.selectdata[this.data.fields[i].field]) {
+              this.data.fields[i].value = this.selectdata[this.data.fields[i].field]
+            }
+          }
           this.initializtion()
+          // this.hasChangeHistory()
           this.showview = true
-        } else if(sum==0) {
+        } else if (sum == 0) {
           this.$showMessage(`没有在JSON配置文件中找到活动名为:(${this.selectdata.defname})的节点配置`)
         } else {
           this.$showMessage(`在JSON配置文件中找到活动名为:(${this.selectdata.defname})的节点配置:${sum}个`)
         }
       },
-      deep:true
+      deep: true
     }
   }
 </script>

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

@@ -12,24 +12,33 @@
           <tab :header='header'>
             <supervisory-service-control  :selectdata="selectdata" ></supervisory-service-control>
           </tab>
-          <tab header='户档案信息'>
-            <record-message v-ref:record :selectdata="selectdata" :key="tittle1" :edit = "false"></record-message>
-          </tab>
-          <tab header='表档案信息'>
-            <record-message v-ref:record :selectdata="selectdata" :key="tittle2" :edit = "false"></record-message>
-          </tab>
-          <tab header='设备信息' v-if="selectdata.f_user_type =='非民用'">
-          <equipment-message v-ref:equipment :selectdata="selectdata" :key="tittle3" :edit = "false"></equipment-message>
-          </tab>
-          <tab header='材料信息'>
-            <material-message v-ref:material :selectdata="selectdata" :edit = "false"></material-message>
+<!--          <tab header='档案信息'>-->
+<!--            <record-message v-ref:record :selectdata="selectdata" :key="tittle1" :edit = "false"></record-message>-->
+<!--          </tab>-->
+          <!--<tab header='表档案信息'>-->
+            <!--<record-message v-ref:record :selectdata="selectdata" :key="tittle2" :edit = "false"></record-message>-->
+          <!--</tab>-->
+          <!--<tab header='设备信息' v-if="selectdata.f_user_type =='非民用'">-->
+          <!--<equipment-message v-ref:equipment :selectdata="selectdata" :key="tittle3" :edit = "false"></equipment-message>-->
+          <!--</tab>-->
+          <!--<tab header='材料信息'>-->
+            <!--<material-message v-ref:material :selectdata="selectdata" :edit = "false"></material-message>-->
+          <!--</tab>-->
+          <tab header='新用户建档' style="background-color :#f6f6f6" v-if="selectdata.f_apply_type == '新用户'">
+            <record-message v-ref:record :selectdata="selectdata" :key="tittle1"
+                            :edit = "true">
+            </record-message>
           </tab>
           <tab header='附件'>
-            <upload v-ref:file :blodid = "selectdata.f_process_id" :isusetype = "false" :isremark ="false"
-                    :isupload = "true"
-                    :takeimg = "true"
-                    :edit = "false">
-            </upload>
+            <apply-upload :blodid="selectdata.f_process_id"
+                          :isupload = "false"
+                          :isdelete="false"
+                          :isusetype="true"
+                          :isremark = "true"
+                          :takeimg="false"
+                          :issearch="true"
+                          :defname="selectdata.defname">
+            </apply-upload>
           </tab>
         </tabset>
       </div>
@@ -38,13 +47,13 @@
 </template>
 <script>
   import Vue from 'vue'
-  import  {HttpResetClass} from 'vue-client'
+  import {HttpResetClass} from 'vue-client'
     export default {
       title: '流程监控',
-      props: [ 'defname'],
-      data() {
+      props: ['defname'],
+      data () {
         return {
-          flagl:false,
+          flagl: false,
           flagg: false,
           showbasic: false,
           showtotal: false,
@@ -52,41 +61,63 @@
           selectdata: {},
           botheight: '0%',
           topheight: '100%',
-          tittle1:'户档案管理',
-          tittle2:'表档案管理',
-          tittle3:'设备管理',
-          info: '流程监控'
+          tittle1: '户档案管理',
+          tittle2: '表档案管理',
+          tittle3: '设备管理',
+          info: '流程监控',
+          xmlname: ''
         }
       },
-      created(){
+      created () {
         let http = new HttpResetClass()
-        http.load('POST','rs/logic/ApplyGetConfigs', {data:this.$login.f}, {resolveMsg: null, rejectMsg: null}
-        ).then((res)=>{
-          if(res.data.code && res.data.code == 200){
+        let xmldata = {
+          data: this.$login.f,
+          workname: '报建初装流程'
+        }
+        http.load('POST', 'rs/logic/ApplyGetConfigs', {data: xmldata}, {resolveMsg: null, rejectMsg: null}
+        ).then((res) => {
+          if (res.data.code && res.data.code === 200) {
             Vue.supervisory_vue = Vue.prototype.$supervisory_vue = res.data.workflow_vue
-          }else{
+          } else {
             this.$showMessage('获取报建配置失败,原因:' + res.data.msg)
             return
           }
         })
-        console.log("$supervisory_vue:"+JSON.stringify(this.$supervisory_vue))
+        console.log('$supervisory_vue:' + JSON.stringify(this.$supervisory_vue))
       },
       events: {
-        'addactive'() {
+        'addactive' () {
           this.$refs.queryuser.$refs.cp.$refs.cri.search()
           this.hidden()
           this.showbasic = true
           this.topheight = '20%'
           this.botheight = '80%'
         },
-        'changeheight'() {
+        'changeheight' () {
           this.show = false
           this.botheight = '0%'
         },
-        'check'(val) {
+        'check' (val) {
           this.selectdata = ''
           this.selectdata = val
-          console.log("节点编号:"+this.selectdata.actdefid,"节点名称:"+this.selectdata.defname)
+          this.selectdata.f_is_hege = 1
+          let http = new HttpResetClass()
+          let data = {
+            tablename: 't_apply',
+            condition: "f_process_id = '" + this.selectdata.f_process_id + "'"
+          }
+          http.load('POST', 'rs/sql/applysingleTable', {data: data}, {resolveMsg: null, rejectMsg: '获取所属公司失败'})
+            .then((res) => {
+              console.log('查询前:' + this.selectdata.f_filiale)
+              this.selectdata.f_filiale = res.data[0].f_filiale
+              this.selectdata.f_demand = res.data[0].f_filiale
+              // this.json_datas.activitys.fields[i].value = res.data[0].f_filiale
+              // console.log("所属公司1：" + res.data[0].f_filiale)
+              // console.log("所属公司2：" + this.selectdata.f_filiale)
+              console.log('查询后:' + this.selectdata.f_filiale)
+            })
+          // console.log('val.f_apply_type:' + val.f_apply_type)
+          console.log('节点编号:' + this.selectdata.actdefid, '节点名称:' + this.selectdata.defname)
           this.topheight = '20%'
           this.botheight = '80%'
           this.$refs.queryuser.$refs.cp.$refs.grid.model.rows = [val]
@@ -95,11 +126,40 @@
           let msg = val.defname
           this.header = msg
           this.hidden()
+          // if (val.f_apply_type === '零星散户' || val.f_apply_type === '新用户') {
+          //   console.log('this.selectdata.f_apply_type:' + this.selectdata.f_apply_type)
+          //   if (this.selectdata.f_apply_type === '零星散户') {
+          //     this.xmlname = '零星散户安装流程'
+          //   } else if (this.selectdata.f_apply_type === '新用户') {
+          //     this.xmlname = '新用户安装流程'
+          //   }
+          //   let xmldata = {
+          //     data: this.$login.f,
+          //     workname: this.xmlname
+          //   }
+          //   let http = new HttpResetClass()
+          //   console.log('xmldata.workname:' + xmldata.workname)
+          //   http.load('POST', 'rs/logic/ApplyGetConfigs', {data: xmldata}, {resolveMsg: null, rejectMsg: null}
+          //   ).then((res)=>{
+          //     if (res.data.code && res.data.code == 200){
+          //       Vue.supervisory_vue = Vue.prototype.$supervisory_vue = res.data.workflow_vue
+          //       if (res.data.msg){
+          //         console.log('获取配置文件信息：', res.data.msg)
+          //       }
+          //       // console.log("Vue.$workflow_vue:"+JSON.stringify(this.$workflow_vue))
+          //       // console.log("this.selectdata的值---------" + JSON.stringify(this.selectdata))
+          //
+          //     } else {
+          //       this.$showMessage('获取报建配置失败,原因:' + res.data.msg)
+          //       return
+          //     }
+          //   })
+          // }
         },
-        'selfsearch'() {
+        'selfsearch' () {
           this.$refs.queryuser.$refs.cp.$refs.cri.search()
         },
-        'close'() {
+        'close' () {
           this.hidden()
           this.showtotal = false
           this.topheight = '100%'
@@ -108,30 +168,30 @@
         }
       },
       methods: {
-        hidden() {
+        hidden () {
           this.showtotal = true
         },
-        close() {
+        close () {
           this.hidden()
           this.topheight = '100%'
           this.botheight = '0%'
         }
       },
       watch: {
-        'selectdata'(val) {
+        'selectdata' (val) {
           console.log('selectdata:', val)
         },
-        'selectdata.f_customer_type'() {
-          if (this.selectdata.f_customer_type == '企业') {
+        'selectdata.f_customer_type' () {
+          if (this.selectdata.f_customer_type === '企业') {
             this.flagg = true
           }
         },
-        'selectdata.f_apply_type'() {
-          if (this.selectdata.f_apply_type=="集体报建" || this.selectdata.f_apply_type=="集体报建流程") {
+        'selectdata.f_apply_type' () {
+          if (this.selectdata.f_apply_type === '集体报建' || this.selectdata.f_apply_type === '集体报建流程') {
             this.flagl = true
           }
         }
-      },
+      }
 
     }
 </script>