apply-clients 4.1.64 → 4.1.65

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

@@ -44,12 +44,6 @@ export default {
     this.refurbish()
   },
   ready(){
-    console.log("1212",this.selectdata)
-    if (this.selectdata.defname === '合同签订') {
-      if (this.show_data.fields[7].label === '合同编号') {
-        this.show_data.fields[7].value = this.show_data.f_apply_num
-      }
-    }
   },
   methods: {
     // 组件初始化操作
@@ -439,12 +433,13 @@ export default {
         start_activity: this.$workflow_vue.start_activity,
         model: model,
         loginUser: this.$login.f,
-        workflow_xmlfilename: this.$workflow_vue.workflow_xmlfilename
+        workflow_gxmlfilename: this.$workflow_vue.workflow_xmlfilename
       }
+      console.log("gwfwe",this.selectdata)
       // 下发，提交，保存，退回通用业务后台处理logic
       let url = 'rs/logic/ApplyProductService'
       let res = await http.load('POST', url, {data: requestData}, {resolveMsg: null, rejectMsg: '数据保存失败'})
-      if (res.data.code == 200) {
+      if (res.data.code === 200) {
         this.$dispatch('search')
       } else {
         if (res.data.msg) {
@@ -637,7 +632,20 @@ export default {
           }
         }
       }
+      if (this.show_data.defname === '报建登记'&&this.show_data.f_apply_type==='工商户报建') {
 
+        console.log("13f", this.selectdata.onetomany)
+        for (const button of this.show_data.buttons) {
+          if (this.selectdata.onetomany&& button.button_name === '提交') {
+            console.log("1f")
+            button.disable = true
+          }
+          else {
+            button.disable = false
+            console.log("2f")
+          }
+        }
+      }
       if (this.show_data.defname === '营业厅建档'){
         let http = new HttpResetClass()
         let data = {
@@ -690,27 +698,23 @@ export default {
         }
       }
       if (this.show_data.defname === '合同签订') {
-          // if (!isEmpty(this.show_data.fields[index].value)) {
-          //   let http = new HttpResetClass()
-          //   let data = {
-          //     tablename: 't_apply',
-          //     condition: `f_contract_number='${this.show_data.fields[index].value}'`
-          //   }
-          //   let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
-          //     resolveMsg: null,
-          //     rejectMsg: '合同编号查重失败'
-          //   })
-          //   if (res.data.length > 0) {
-          //     for (const button of this.show_data.buttons) {
-          //       if (button.button_name === '提交') {
-          //         button.disable = true
-          //            }
-          //        }
-          //     this.show_data.fields[index].value = null
-          //     this.$showAlert('合同编号已存在！！！', 'warning', 3000)
-          //   }
-          // }
-
+        if (this.show_data.fields[index].label === '合同编号') {
+          if (!isEmpty(this.show_data.fields[index].value)) {
+            let http = new HttpResetClass()
+            let data = {
+              tablename: 't_apply',
+              condition: `f_contract_number='${this.show_data.fields[index].value}'`
+            }
+            let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
+              resolveMsg: null,
+              rejectMsg: '合同编号查重失败'
+            })
+            if (res.data.length > 0) {
+              this.show_data.fields[index].value = null
+              this.$showAlert('合同编号已存在！！！', 'warning', 3000)
+            }
+          }
+        }
         if (this.show_data.fields[index].label === '单价（户）') {
           let http = new HttpResetClass()
           let data = {

package/src/components/product/ServiceView.vue

@@ -316,7 +316,6 @@
         <button type="button" class="btn btn-primary" :disabled="disable_button_but" @click='confirm_but_modal()'>确认</button>
       </footer>
     </modal>
-
   </div>
 </template>
 <script>
@@ -364,19 +363,15 @@
         showbutmodal: false,
         showcheck: false,
         back: '',
-        selecteddd:[],
-        all:[]
       }
-
     },
     ready() {
       console.log("7777777")
-      console.log(this.data.onetomany)
+      console.log(this.data)
     },
     watch: {
       deep: true,
     },
-    computed: {},
     created() {
       // 初始化数据
       this.initializtion()
@@ -399,6 +394,7 @@
         this.disable_button = true
         console.log("this.data")
         console.log(this.data)
+        console.log(button)
         // 组织model.fields数据
         for (const item of this.data.fields) {
           // checkbox特殊处理
@@ -444,27 +440,27 @@
             }
           }
         }
-        if (this.data.defname === '合同签订') {
-        console.log("ddddd",this.data)
-        }
-        if (this.data.defname === '竣工验收') {
-          if (this.data.processname !== '工商户报建流程') {
-              let t=this.selecteddd
-              let diff = this.all.filter(function (val) {
-                return t.indexOf(val) === -1
-              })
-              console.log("diff", diff)
-              for(let index = 0;index < diff.length; index++){
-                let data = {
-                  code:diff[index].f_userinfo_code
-                }
-                console.log("code", data.code)
-                let http = new HttpResetClass()
-                http.load('POST', 'rs/logic/batchcheck', {data:data}, {resolveMsg: null, rejectMsg: null})
-
-            }
-          }
-        }
+        // if (this.data.defname === '合同签订') {
+        // console.log("ddddd",this.data)
+        // }
+        // if (this.data.defname === '竣工验收') {
+        //   // if (this.data.processname !== '工商户报建流程') {
+        //   //     let t=this.selecteddd
+        //   //     let diff = this.all.filter(function (val) {
+        //   //       return t.indexOf(val) === -1
+        //   //     })
+        //   //     console.log("diff", diff)
+        //   //     for(let index = 0;index < diff.length; index++){
+        //   //       let data = {
+        //   //         code:diff[index].f_userinfo_code
+        //   //       }
+        //   //       console.log("code", data.code)
+        //   //       let http = new HttpResetClass()
+        //   //       http.load('POST', 'rs/logic/batchcheck', {data:data}, {resolveMsg: null, rejectMsg: null})
+        //   //
+        //   //   }
+        //   // }
+        // }
         if (button.button_name === '退回') {
           this.showbutmodal = true
         } else if (button.button_name === '下发') {
@@ -475,9 +471,6 @@
           this.$dispatch('button', this.model)
         }
       },
-//
-
-
       // 初始化数据
       initializtion() {
         // 是否禁用按钮
@@ -511,8 +504,6 @@
           this.model.f_operator = this.$login.f.name
         }
       },
-
-
       // 是否禁用按钮
       disableButton() {
         let fields = this.data.fields
@@ -723,13 +714,6 @@
         this.disableModalButton()
         this.$dispatch('oninput_modal', this.onetomany_index, index)
       }
-    },
-    events: {
-      'selectedData'(selecteddd, all) {
-        this.selecteddd  = selecteddd
-        this.all  = all
-      }
-
     }
   }
 </script>

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

@@ -7,7 +7,7 @@
             <div class="form-group col-sm-4">
               <label class="font_normal_body">项目名称:</label>
               <input type="text" class="input_search" v-model="model.f_user_name"
-                     v-on:keyup.enter="search" condition=" (f_entry_name like '%{}%') " placeholder='请输入'>
+                     v-on:keyup.enter="search" condition=" f_entry_name = '{}' " placeholder='请输入'>
             </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">报建编号：</label>
@@ -119,7 +119,7 @@
               <nobr>{{row.f_apply_num}}</nobr>
             </td>
             <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_entry_name}}/{{row.f_user_name}}/{{row.f_contact}}</nobr>
+              <nobr>{{row.f_entry_name}}</nobr>
             </td>
             <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_contract_number}}</nobr>