apply-clients 3.3.17 → 3.3.21

package/package.json

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

package/src/components/android/Process/Processes/AppInstallationDetails.vue

@@ -186,7 +186,7 @@
       </article>
       <footer slot="modal-footer" class="modal-footer">
         <!-- 去除一户多表 -->
-        <button type="button" class="btn btn-primary" @click="addUserFile">添加表具</button>
+        <button type="button" class="btn btn-primary" @click="addUserFile" v-if="false">添加表具</button>
         <button type="button" class="btn btn-primary" @click="saveUserFile">确认</button>
       </footer>
     </modal>

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

@@ -238,7 +238,7 @@
     <footer slot="modal-footer" class="modal-footer">
       <template v-if="mark !== 1">
         <!-- 去除一户多表 -->
-        <button type="button" class="btn btn-primary" @click="addUserFile">添加表具</button>
+        <button type="button" class="btn btn-primary" @click="addUserFile" v-if="false">添加表具</button>
         <button type="button" class="btn btn-primary" @click="saveUserFile" :disabled="!$v.valid">确认</button>
       </template>
     </footer>

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

@@ -33,7 +33,7 @@
       width: 150px;
       height: 150px;
       /*opacity: 0.5;*/
-      /*z-index: -1;*/
+      z-index: -1;
     }
   </style>
   <div id="print">
@@ -52,7 +52,7 @@
       </tr>
       <tr>
         <td style="width: 17%">用户姓名</td>
-        <td colspan="2" style="width: 33%">{{ charge.f_user_name }}</td>
+        <td colspan="2" style="width: 33%">{{ selectdata.f_user_name }}</td>
         <td style="width: 17%">用户编号</td>
         <td colspan="2" style="width: 33%">{{ selectdata.f_userinfo_code }}</td>
       </tr>
@@ -88,7 +88,7 @@
         </td>
       </tr>
     </table>
-    <img class="seal" border="0" :src="src" transcolor="#FFFFFF" alt="">
+    <img class="seal" border="0" :src="src" alt="">
   </div>
 
   <print-element v-show="false" v-ref:print id='print' styleid='style'

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

@@ -328,6 +328,34 @@ export default {
         }
       }
     },
+    showLabels(...labels) {
+      for (const item of this.show_data.fields) {
+        if (labels.includes(item.label)) {
+          item.hidden = false
+        }
+      }
+    },
+    hideLabels(...labels) {
+      for (const item of this.show_data.fields) {
+        if (labels.includes(item.label)) {
+          item.hidden = true
+        }
+      }
+    },
+    requiredLabels(...labels) {
+      for (const item of this.show_data.fields) {
+        if (labels.includes(item.label)) {
+          item.required = true
+        }
+      }
+    },
+    electiveLabels(...labels) {
+      for (const item of this.show_data.fields) {
+        if (labels.includes(item.label)) {
+          item.required = false
+        }
+      }
+    },
     async checkDuplicate(index) {
       let http = new HttpResetClass()
       let data = {
@@ -465,6 +493,65 @@ export default {
           value: item
         }
       })
+    },
+    addressInitialization () {
+      this.$getConfig(this, 'UserAddress')
+
+      let f_address_type = this.show_data.f_address_type
+
+      for (const item of this.show_data.fields) {
+        if (f_address_type === '民用市区') {
+          if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号') {
+            item.hidden = false
+            item.required = true
+          }
+          if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层') {
+            item.hidden = false
+            item.required = false
+          }
+          if (item.label === '地址') {
+            item.readonly = true
+          }
+        }
+        if (f_address_type === '民用乡镇') {
+          if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号') {
+            item.hidden = false
+            item.required = true
+          }
+          if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层') {
+            item.hidden = false
+            item.required = false
+          }
+          if (item.label === '楼层') {
+            item.hidden = true
+            item.required = false
+          }
+          if (item.label === '地址') {
+            item.readonly = true
+          }
+        }
+        if (f_address_type === '特殊地址') {
+          if (item.label === '区/县' || item.label === '街道/乡镇') {
+            item.hidden = false
+            item.required = true
+          }
+          if (item.label === '集收单位') {
+            item.hidden = false
+            item.required = false
+          }
+          if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层' || item.label === '门牌号') {
+            item.hidden = true
+            item.required = false
+          }
+          if (item.label === '地址') {
+            item.readonly = false
+          }
+        }
+
+        if (this.show_data.f_apply_source === '线下发起' && item.label === '预约地址') {
+          item.hidden = true
+        }
+      }
     }
   },
   events: {
@@ -499,6 +586,7 @@ export default {
         {resolveMsg: null, rejectMsg: '公司查询失败！！！'}
       )
       this.show_data.f_dev_id = res.data[0].id
+      this.show_data.f_dev_code = res.data[0].f_dev_code
       this.setLabelValue('法人名称', res.data[0].f_legal_person)
       this.setLabelValue('身份证', res.data[0].f_idnumber)
       this.setLabelValue('营业执照', res.data[0].f_license_num)
@@ -844,65 +932,23 @@ export default {
         }
       }
     },
+    // 团购转散户初始化
+    'apply2ReadyEvent' () {
+      if (this.show_data.f_apply_source === '线下发起') {
+        this.addressInitialization()
+        this.hideLabels('用户编号')
+        this.electiveLabels('用户编号')
+        this.showLabels('片区', '地址类型')
+        this.requiredLabels('片区', '地址类型')
+      }
+      if (this.show_data.f_apply_source === '自动发起') {
+        this.hideLabels('片区', '地址类型')
+        this.electiveLabels('片区', '地址类型',)
+      }
+    },
     // 申请节点初始化
     'applyReadyEvent' () {
-      this.$getConfig(this, 'UserAddress')
-
-      let f_address_type = this.show_data.f_address_type
-
-      for (const item of this.show_data.fields) {
-        if (f_address_type === '民用市区') {
-          if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号') {
-            item.hidden = false
-            item.required = true
-          }
-          if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层') {
-            item.hidden = false
-            item.required = false
-          }
-          if (item.label === '地址') {
-            item.readonly = true
-          }
-        }
-        if (f_address_type === '民用乡镇') {
-          if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号') {
-            item.hidden = false
-            item.required = true
-          }
-          if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层') {
-            item.hidden = false
-            item.required = false
-          }
-          if (item.label === '楼层') {
-            item.hidden = true
-            item.required = false
-          }
-          if (item.label === '地址') {
-            item.readonly = true
-          }
-        }
-        if (f_address_type === '特殊地址') {
-          if (item.label === '区/县' || item.label === '街道/乡镇') {
-            item.hidden = false
-            item.required = true
-          }
-          if (item.label === '集收单位') {
-            item.hidden = false
-            item.required = false
-          }
-          if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层' || item.label === '门牌号') {
-            item.hidden = true
-            item.required = false
-          }
-          if (item.label === '地址') {
-            item.readonly = false
-          }
-        }
-
-        if (this.show_data.f_apply_source === '线下发起' && item.label === '预约地址') {
-          item.hidden = true
-        }
-      }
+      this.addressInitialization()
     },
     // ===========================================
     async 'button'() {
@@ -932,7 +978,7 @@ export default {
     },
     // 失去焦点出触发事件
     'onchange' (index) {
-      if (this.show_data.defname === '报装申请') {
+      if (this.show_data.defname === '报装申请' || this.show_data.defname === '信息确认') {
         if (
           this.show_data.fields[index].label === '区/县' ||
           this.show_data.fields[index].label === '街道/乡镇' ||