apply-clients 3.1.51 → 3.1.54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.1.51",
+  "version": "3.1.54",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/components/product/Function/InstallInfoSelect.vue

@@ -121,8 +121,9 @@
       </criteria>
       <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
         <template partial='head'>
-          <tr class="title">
+          <tr>
             <th>序号</th>
+            <th><div style="width:80px">流程操作</div></th>
             <th>报建编号</th>
             <th>当前环节</th>
             <th>客户名称/联系人</th>
@@ -131,7 +132,6 @@
             <th>地址</th>
             <th>报建类型</th>
             <th>报建日期</th>
-            <th>操作</th>
           </tr>
         </template>
         <template partial='body'>
@@ -139,6 +139,18 @@
             <td  style="text-align: center;">
               <nobr>{{$index+1}}</nobr>
             </td>
+            <td style="text-align: center;">
+              <dropdown>
+                <button @click="$parent.$parent.$parent.checkfuncs(row)" type="button" data-toggle="dropdown" style="border: 0px;background: none;">
+                  <span class="glyphicon glyphicon-th-list" style="position: inherit;"></span>
+                </button>
+                <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-right">
+                  <li v-for="(index,func) in $parent.$parent.$parent.funcs">
+                    <a href="#" @click="$parent.$parent.$parent.$parent.func(func,row)">{{func.title}}</a>
+                  </li>
+                </ul>
+              </dropdown>
+            </td>
             <td style="text-align: center;">
               <nobr><font>{{row.f_apply_num}}</font></nobr>
             </td>
@@ -163,18 +175,6 @@
             <td style="text-align: center;">
               <nobr>{{row.f_apply_date}}</nobr>
             </td>
-            <td style="text-align: center;">
-              <dropdown>
-                <button @click="$parent.$parent.$parent.checkfuncs(row)" type="button" data-toggle="dropdown" style="border: 0px;background: none;">
-                  <span class="glyphicon glyphicon-th-list" style="position: inherit;"></span>
-                </button>
-                <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-right">
-                  <li v-for="(index,func) in $parent.$parent.$parent.funcs">
-                    <a href="#" @click="$parent.$parent.$parent.$parent.func(func,row)">{{func.title}}</a>
-                  </li>
-                </ul>
-              </dropdown>
-            </td>
           </tr>
         </template>
       </data-grid>

package/src/components/product/Function/functions/ChargeManagement.vue

@@ -881,7 +881,7 @@ export default {
     async deleteDevice (row) {
       let data = {
         f_process_id: this.data.f_process_id,
-        f_ticket_number: row.f_ticket_number,
+        f_charge_id: row.id,
         user: this.$login.f
       }
       let res = await this.$resetpost(

package/src/components/product/Process/ExplorationSelect.vue

@@ -124,6 +124,7 @@
         <template partial='head'>
           <tr>
             <th>序号</th>
+            <th>流程操作</th>
             <th>报建编号</th>
             <th>客户名称/联系人</th>
             <th>当前状态</th>
@@ -133,7 +134,6 @@
             <th>地址</th>
             <th>报建类型</th>
             <th>报建日期</th>
-            <th>操作</th>
           </tr>
         </template>
         <template partial='body'>
@@ -141,6 +141,18 @@
             <td style="text-align: center;">
               <nobr><font>{{$index+1}}</font></nobr>
             </td>
+            <td style="text-align: center;">
+              <dropdown>
+                <button type="button" data-toggle="dropdown" style="border: 0px;background: none;">
+                  <span class="glyphicon glyphicon-th-list" style="position: inherit;"></span>
+                </button>
+                <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-right">
+                  <li>
+                    <a href="#" @click="$parent.$parent.$parent.click(row)">{{row.defname}}</a>
+                  </li>
+                </ul>
+              </dropdown>
+            </td>
             <td style="text-align: center;">
               <nobr><font>{{row.f_apply_num}}</font></nobr>
             </td>
@@ -168,18 +180,6 @@
             <td style="text-align: center;">
               <nobr><font>{{row.f_apply_date}}</font></nobr>
             </td>
-            <td style="text-align: center;">
-              <dropdown>
-                <button type="button" data-toggle="dropdown" style="border: 0px;background: none;">
-                  <span class="glyphicon glyphicon-th-list" style="position: inherit;"></span>
-                </button>
-                <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-right">
-                  <li>
-                    <a href="#" @click="$parent.$parent.$parent.click(row)">{{row.defname}}</a>
-                  </li>
-                </ul>
-              </dropdown>
-            </td>
           </tr>
         </template>
       </data-grid>

package/src/components/product/Process/Service/ServiceControl.vue

@@ -684,9 +684,8 @@
       },
       //  根据小区名称获取合同编号
       async getContractNumber() {
-        console.log("进来了没有1")
         if (this.selectdata.defname == '申请登记') {
-
+          console.log("获取合同编号")
           for (let i = 0; i < this.show_data.fields.length; i++) {
             // console.log("进来了没有2")
             // console.log("选择框的名称：" + this.show_data.fields[i].label + "---小区名称的长度：" + this.show_data.fields[i].value.length)
@@ -847,16 +846,149 @@
 
 
 
-      }
+      },
+      async stopApply () {
+        console.log('终止报建！！！！！')
+
+        if (this.show_data.defname === '报建受理') {
+          this.show_data.f_stop_reason = this.show_data.f_accept_result
+        }
+        if (this.show_data.defname === '现场勘察') {
+          this.show_data.f_stop_reason = this.show_data.f_project_describe
+        }
+        if(!this.show_data.f_stop_reason){
+          this.show_data.f_stop_reason = '终止'
+        }
+        let data = {
+          selectdata: this.show_data,
+          loginUser: this.$login.f,
+          model: {f_stop_remarks: this.show_data.f_stop_reason}
+        }
 
+        let res = await this.$resetpost(
+          `rs/logic/stopApply`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: '终止报建失败！！！'}
+        )
+
+        this.$dispatch('selfsearch')
+
+      },
+      // 获取片区
+      async getPcd () {
+        let data = {
+          tablename: 't_pcd',
+          condition: `f_filialeid = '${this.$login.f.orgid}'`
+        }
+        let http = new HttpResetClass()
+        let res = await http.load(
+          'POST',
+          `rs/sql/applysingleTable`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: '片区查询失败！！！'}
+        )
+
+        let pcd =  res.data.map(item => {
+          return {
+            label: item.f_pcd,
+            value: item.f_pcd
+          }
+        })
+        for (const item of this.show_data.fields) {
+          if (item.label === '片区') {
+            item.options = pcd
+          }
+        }
+      },
+      // 获取街道
+      async getStreet (){
+        let http = new HttpResetClass()
+        let condition = "f_filialeid = " + this.$login.f.orgid
+        let res = await http.load('POST','rs/logic/apply_queryArea',{data:{condition:condition}}, {resolveMsg: null, rejectMsg: null})
+        let street = res.data.queryStreet.map(item=>{
+          return {
+            label: item.f_street,
+            value: item.f_street
+          }
+        })
+        for (const item of this.show_data.fields) {
+          if (item.label === '街道') {
+            item.options = street
+          }
+        }
+      }
     },
     events: {
+      async 'updateArea' (index) {
+        if (this.show_data.fields[index].value === '新小区') {
+          console.log("测试小区",index)
+          for (const item of this.show_data.fields) {
+            if (item.label === '小区') {
+              item.value = ''
+              item.hidden = true
+            }
+            if (item.label === '小区名称') {
+              item.value = ''
+              item.hidden = false
+            }
+          }
+        } else {
+          for (const item of this.show_data.fields) {
+            if (item.label === '小区名称') {
+              item.value = ''
+              item.hidden = true
+            }
+            if (item.label === '小区') {
+              item.value = ''
+              item.hidden = false
+            }
+          }
+        }
+      },
+      'confirmBuildFiles'(index){
+        if (this.show_data.fields[index].value === '否') {
+            for (const item of this.show_data.buttons){
+              if (item.button_name === '提交') {
+                  item.disabled = true
+              }
+            }
+        }
+      },
+      'buildArea'(){
+        if(this.show_data.f_area_type === '新小区'){
+          // this.getPcd()
+          this.getStreet()
+          for (const item of this.show_data.fields) {
+            if (item.label === '县/区') {
+              item.required = true
+              item.hidden = false
+            }
+            if (item.label === '街道') {
+              item.required = true
+              item.hidden = false
+            }
+            if (item.label === '片区') {
+              item.required = true
+              item.hidden = false
+            }
+            if (item.label === '小区名称') {
+              item.required = true
+              item.hidden = false
+            }
+          }
+        }
+      },
       test(i, j){
         console.log('删除')
         console.log(i + '-----' +j)
       },
       // 获取view层button事件/
       async 'button'(model) {
+        //before事件
+        console.log("当前按钮",model.button)
+        if (model.button.before) {
+          await this[model.button.before]()
+        }
         // 点击重置按钮就重置数据
         if (model.button.button_name === '重置') {
           this.refurbish()
@@ -950,6 +1082,7 @@
           this.$refs.service_show.data.fields[index].label === '县/区' ||
           this.$refs.service_show.data.fields[index].label === '街道' ||
           this.$refs.service_show.data.fields[index].label === '小区' ||
+          this.$refs.service_show.data.fields[index].label === '小区名称' ||
           this.$refs.service_show.data.fields[index].label === '楼号' ||
           this.$refs.service_show.data.fields[index].label === '单元号' ||
           this.$refs.service_show.data.fields[index].label === '楼层' ||
@@ -967,7 +1100,7 @@
             if (this.$refs.service_show.data.fields[i].label === '街道' && this.$refs.service_show.data.fields[i].value) {
               address += this.$refs.service_show.data.fields[i].value
             }
-            if (this.$refs.service_show.data.fields[i].label === '小区' && this.$refs.service_show.data.fields[i].value) {
+            if ((this.$refs.service_show.data.fields[i].label === '小区名称' || this.$refs.service_show.data.fields[i].label === '小区') && this.$refs.service_show.data.fields[i].value) {
               address += this.$refs.service_show.data.fields[i].value
             }
             if (this.$refs.service_show.data.fields[i].label === '楼号' && this.$refs.service_show.data.fields[i].value) {

package/src/components/product/ReportForm/CustomerRecordMessage.vue

@@ -1488,26 +1488,31 @@
             //   }
             // })
             let http = new HttpResetClass()
-          let w = await http.load('POST', 'rs/logic/recordImport', data, {
+            await http.load('POST', 'rs/logic/recordImport', data, {
               resolveMsg: null,
               rejectMsg: '导入失败'
-            })
-              if(w.data) {
-                this.iswork = false;
+            }).then((res) => {
+              if(res.data){
+                this.iswork=false;
                 this.load();
                 this.closeFile();
                 let mm = '';
-                for (var i = 0; i < w.data.msg.length; i++) {
-                  mm += `${w.data.msg[i].msg}`
+                for(let i = 0; i < res.data.msg.length; i++){
+                  mm+= `${res.data.msg[i].msg}`
+                }
+                let worry = '';
+                for(let j = 0; j < res.data.worry.length; j++){
+                  worry += `${res.data.worry[j].msg}`
                 }
-                let msg = `共导入${w.data.alllength}条,失败${w.data.errorlen}条,失败信息:${mm}`
-                if (w.data.code === 500) {
-                  this.iswork = false;
-                  msg = w.data.msg
+                let msg = `共导入${res.data.alllength}条,失败${res.data.errorlen}条,失败信息:${mm},提醒：${worry}`
+                if (res.data.code == 500) {
+                  this.iswork=false;
+                  msg = res.data.msg
                 }
                 console.log("返回的数据：" + JSON.stringify(res.data))
                 this.$showMessage(msg)
               }
+            })
           // }catch(e){
           //
           //   this.$showAlert('导入出错,请检查导入文件模板格式!','danger',2000);
@@ -1532,26 +1537,27 @@
           };
           console.log('即将转发的数据',data);
           let http = new HttpResetClass()
-          let result = await http.load('POST', 'rs/logic/incrementImport', data, {
+          await http.load('POST', 'rs/logic/incrementImport', data, {
             resolveMsg: null,
             rejectMsg: '导入失败'
-          })
-            if(result.data){
+          }).then((res) => {
+            if(res.data){
               this.iswork=false;
               this.load();
               this.closeFile();
               let mm = '';
-              for(var i=0;i<result.data.msg.length;i++){
-                mm+= `${result.data.msg[i].msg}`
+              for(var i=0;i<res.data.msg.length;i++){
+                mm+= `${res.data.msg[i].msg}`
               }
-              let msg = `共导入${result.data.alllength}条,失败${result.data.errorlen}条,失败信息:${mm}`
-              if (result.data.code == 500) {
+              let msg = `共导入${res.data.alllength}条,失败${res.data.errorlen}条,失败信息:${mm}`
+              if (res.data.code == 500) {
                 this.iswork=false;
-                msg = result.data.msg
+                msg = res.data.msg
               }
-              console.log("返回的数据：" + JSON.stringify(result.data))
+              console.log("返回的数据：" + JSON.stringify(res.data))
               this.$showMessage(msg)
             }
+          })
           // try{
           //   await axios.post('rs/logic/incrementImport',
           //     data).then((res)=>{

package/src/components/product/ServiceView.vue

@@ -366,6 +366,9 @@
     created () {
       // 初始化数据
       this.initializtion()
+      if (this.data.readyEvent) {
+        this.$dispatch(this.data.readyEvent)
+      }
     },
     methods: {
       // 按钮模态框确定
@@ -399,6 +402,9 @@
         }
         buttondatas.button_name = button.button_name
         buttondatas.button_index = index
+        if (button.before){
+          buttondatas.before = button.before
+        }
         if (button.button_fields) {
           button.button_fields.forEach(item => {
             buttondatas.button_fields[item.field] = item.value
@@ -480,6 +486,10 @@
       check (index) {
         // 是否禁用按钮
         this.disableButton()
+        if (this.data.fields[index].onchange) {
+          console.log("当前onchange",this.data.fields[index].onchange)
+          this.$dispatch(this.data.fields[index].onchange, index)
+        }
 
         this.$dispatch('check', index)
         // 如果有错误信息提示走错误信息判断处理