apply-clients 4.1.66 → 4.1.70

package/src/components/product/Process/Processes/printCharge.vue

@@ -47,10 +47,10 @@
         <td>联系电话</td>
         <td>{{ f_user_phone }}</td>
       </tr>
-      <tr>
-        <td>地&emsp;&emsp;址</td>
-        <td colspan="4">{{ f_useraddress }}</td>
-      </tr>
+<!--      <tr>-->
+<!--        <td>地&emsp;&emsp;址</td>-->
+<!--        <td colspan="4">{{ f_useraddress }}</td>-->
+<!--      </tr>-->
       <tr>
         <td>收费项目</td>
         <td colspan="2">安装费</td>

package/src/components/product/Process/Processes/recordcancel.vue

@@ -1,50 +1,50 @@
-<template>
-  <div class="auto">
-    <validator name='v'>
-      <p class="bg-info text-center" style="padding: 8px;">{{data.type}}销户</p>
-      <div class="row" style="margin-top:10px;">
-        <div class="form-group">
-          <label class=" col-sm-2 control-label">销户原因:</label>
-          <div class="col-sm-8">
-            <textarea class="form-control" v-model="model.f_cancel_reason" rows="3" placeholder="请填写原因"></textarea>
-          </div>
-        </div>
-      </div>
-      <div style="text-align:right;height:auto;margin-top:30px;margin-right:50px;">
-        <button class="btn btn-success" @click="confirm()" >确&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;认</button>
-        <button class="btn btn-default" @click="clean()" style="wid0px;margin-left:20px;">取&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;消</button>
-      </div>
-    </validator>
-  </div>
-</template>
-
-<script>
-import {HttpResetClass} from "vue-client";
-
-export default {
-  props: ['data'],
-  title: '操作撤销',
-  data () {
-    return {
-      model: {
-        f_cancel_reason: '',
-        f_user_state: this.data.f_user_state,
-        f_process_id: this.data.f_process_id
-      }
-    }
-  },
-  methods: {
-    confirm () {
-      let http = new HttpResetClass()
-      http.load('POST', 'rs/entity/t_zsrecord', model, {resolveMsg: null, rejectMsg: '数据保存失败'})
-        .then(res => {
-          this.$info('撤销成功')
-          this.$dispatch('stoprecord')
-        })
-    },
-    clean () {
-      this.$dispatch('clean', this.model)
-    }
-  }
-}
-</script>
+<template>
+  <div class="auto">
+    <validator name='v'>
+      <p class="bg-info text-center" style="padding: 8px;">{{data.type}}销户</p>
+      <div class="row" style="margin-top:10px;">
+        <div class="form-group">
+          <label class=" col-sm-2 control-label">销户原因:</label>
+          <div class="col-sm-8">
+            <textarea class="form-control" v-model="model.f_cancel_reason" rows="3" placeholder="请填写原因"></textarea>
+          </div>
+        </div>
+      </div>
+      <div style="text-align:right;height:auto;margin-top:30px;margin-right:50px;">
+        <button class="btn btn-success" @click="confirm()" >确&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;认</button>
+        <button class="btn btn-default" @click="clean()" style="wid0px;margin-left:20px;">取&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;消</button>
+      </div>
+    </validator>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from "vue-client";
+
+export default {
+  props: ['data'],
+  title: '操作撤销',
+  data () {
+    return {
+      model: {
+        f_cancel_reason: '',
+        f_user_state: this.data.f_user_state,
+        f_process_id: this.data.f_process_id
+      }
+    }
+  },
+  methods: {
+    confirm () {
+      let http = new HttpResetClass()
+      http.load('POST', 'rs/entity/t_zsrecord', model, {resolveMsg: null, rejectMsg: '数据保存失败'})
+        .then(res => {
+          this.$info('撤销成功')
+          this.$dispatch('stoprecord')
+        })
+    },
+    clean () {
+      this.$dispatch('clean', this.model)
+    }
+  }
+}
+</script>

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

@@ -292,6 +292,18 @@ export default {
           }
         }
       }
+      if (this.selectdata.defname === '施工') {
+        // for (let i = 0; i < this.show_data.fields.length; i++) {
+        //   if (this.show_data.fields[i].label == '工程状态') {
+        //     this.show_data.fields[i].value = ''
+        //   }
+        // }
+        for (const item of this.show_data.fields) {
+          if (item.label === '工程状态') {
+            return item.value = '未开工'
+          }
+        }
+      }
 
     },
     // 初始化fields值
@@ -646,25 +658,25 @@ export default {
           }
         }
       }
-      if (this.show_data.defname === '营业厅建档'){
-        let http = new HttpResetClass()
-        let data = {
-          tablename: 't_userinfo',
-          condition: `f_process_id='${this.selectdata.f_process_id}'`
-
-        }
-        let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {resolveMsg: null, rejectMsg: null})
-
-        if (this.show_data.fields[index].label === '是否已建档') {
-          if (res.data[0].f_user_state === '预备') {
-            this.show_data.fields[index].value = '否'
-            button.hidden = false
-          }else{
-            this.show_data.fields[index].value = '是'
-            button.hidden = true
-          }
-        }
-      }
+      // if (this.show_data.defname === '营业厅建档'){
+      //   let http = new HttpResetClass()
+      //   let data = {
+      //     tablename: 't_userinfo',
+      //     condition: `f_process_id='${this.selectdata.f_process_id}'`
+      //
+      //   }
+      //   let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {resolveMsg: null, rejectMsg: null})
+      //
+      //   if (this.show_data.fields[index].label === '是否已建档') {
+      //     if (res.data[0].f_user_state === '预备') {
+      //       this.show_data.fields[index].value = '否'
+      //       button.hidden = false
+      //     }else{
+      //       this.show_data.fields[index].value = '是'
+      //       button.hidden = true
+      //     }
+      //   }
+      // }
       if(this.show_data.defname === '现场勘察') {
         console.log("this.shdata",this.show_data)
         if (this.show_data.fields[index].label === '是否具备安装条件') {
@@ -677,26 +689,26 @@ export default {
           }
         }
       }
-      if (this.show_data.defname === '通气点火'){
-        let http = new HttpResetClass()
-        let data = {
-          tablename: 't_firemessage',
-          condition: `f_process_id='${this.selectdata.f_process_id}'`
-
-        }
-        let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {resolveMsg: null, rejectMsg: null})
-    console.log("res")
-        console.log(res.data)
-        if (this.show_data.fields[index].label === '是否已通气') {
-          if (res.data.length==0) {
-            this.show_data.fields[index].value = '否'
-            button.hidden = false
-          }else{
-            this.show_data.fields[index].value = '是'
-            button.hidden = true
-          }
-        }
-      }
+      // if (this.show_data.defname === '通气点火'){
+      //   let http = new HttpResetClass()
+      //   let data = {
+      //     tablename: 't_firemessage',
+      //     condition: `f_process_id='${this.selectdata.f_process_id}'`
+      //
+      //   }
+      //   let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {resolveMsg: null, rejectMsg: null})
+      //   console.log("res")
+      //   console.log(res.data)
+      //   if (this.show_data.fields[index].label === '是否已通气') {
+      //     if (res.data.length==0) {
+      //       this.show_data.fields[index].value = '否'
+      //       button.hidden = false
+      //     }else{
+      //       this.show_data.fields[index].value = '是'
+      //       button.hidden = true
+      //     }
+      //   }
+      // }
       if (this.show_data.defname === '合同签订') {
         if (this.show_data.fields[index].label === '合同编号') {
           if (!isEmpty(this.show_data.fields[index].value)) {
@@ -713,6 +725,14 @@ export default {
               this.show_data.fields[index].value = null
               this.$showAlert('合同编号已存在！！！', 'warning', 3000)
             }
+            //拼写合同编号
+            if (this.selectdata.f_apply_type == '工商户报建') {
+              this.show_data.fields[index].value = "ZS-S-" + this.show_data.fields[index].value
+              // this.show_data.fields[index].value = "ZS-S-" + this.show_data.fields[index].value + "-" + new Date().Format('yyyy-MM-dd')
+            }else {
+              this.show_data.fields[index].value = "ZS-M-" + this.show_data.fields[index].value
+              // this.show_data.fields[index].value = "ZS-M-" + this.show_data.fields[index].value + "-" + new Date().Format('yyyy-MM-dd')
+            }
           }
         }
         if (this.show_data.fields[index].label === '单价（户）') {