apply-clients 3.3.15 → 3.3.19

package/package.json

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

package/src/apply.js

@@ -59,8 +59,8 @@ export default function (filiale) {
   Vue.component('installation-details', (resolve) => { require(['./components/product/Process/Processes/InstallationDetails'], resolve) })
   // 收费管理
   Vue.component('apply-charge-management', (resolve) => { require(['./components/product/Process/Processes/chargeManagement'], resolve) })
-  Vue.component('apply-print-charge', (resolve) => { require(['./components/product/Process/Processes/printCharge'], resolve) })
-  Vue.component('apply-print-refund', (resolve) => { require(['./components/product/Process/Processes/printRefund'], resolve) })
+  Vue.component('apply-print-charge', (resolve) => { require(['./components/product/Process/Processes/Print/printCharge'], resolve) })
+  Vue.component('apply-print-refund', (resolve) => { require(['./components/product/Process/Processes/Print/printRefund'], resolve) })
   // 补充协议
   Vue.component('supplemental-agreement', (resolve) => { require(['./components/product/Process/Processes/supplementalAgreement'], resolve) })
   // 选择用户信息

package/src/components/android/Process/AppServiceControl.vue

@@ -487,13 +487,10 @@ export default {
             item.hidden = false
           }
         } else {
-          if (item.label === '保费开始日期' || item.label === '保费结束日期' || item.label === '险种' || item.label === '保费金额') {
+          if (item.label === '保费开始日期' || item.label === '保费结束日期' || item.label === '险种' || item.label === '保费金额' || item.label === '保险备注') {
             item.hidden = true
             item.required = false
           }
-          if (item.label === '保险备注') {
-            item.hidden = true
-          }
         }
       }
     },
@@ -545,13 +542,16 @@ export default {
           if (item.label === '保险备注') {
             item.hidden = false
           }
-        } else {
-          if (item.label === '保费开始日期' || item.label === '保费结束日期' || item.label === '险种' || item.label === '保费金额') {
-            item.hidden = true
-            item.required = false
+          // 本期保费到期时间默认一年
+          if (isEmpty(this.selectdata.f_ins_expiration_date)) {
+            let f_ins_expiration_date = new Date().setFullYear(new Date().getFullYear() + 1)
+            this.setLabelValue("保费结束日期", new Date(f_ins_expiration_date).Format('yyyy-MM-dd'))
           }
-          if (item.label === '保险备注') {
+        }
+        if (f_is_insure === '否') {
+          if (item.label === '保费开始日期' || item.label === '保费结束日期' || item.label === '险种' || item.label === '保费金额' || item.label === '保险备注') {
             item.hidden = true
+            item.required = false
           }
         }
       }

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

@@ -22,7 +22,7 @@
                    href="/apply/download/excel/安装明细.xlsx" download>模板下载</a>
                 <export-excel :data="$parent.$parent.$parent.getCondition"
                               :field="$parent.$parent.$parent.getfield"
-                              sqlurl="rs/logic/applyExportfile"
+                              sqlurl="rs/logic/exportfile"
                               sql-name="getInstallableAddress"
                               template-name='可安装地址'
                               btn-name="导出可安装"
@@ -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/{printCharge.vue → Print/printCharge.vue}

@@ -26,6 +26,15 @@
       float: right;
       padding-right: 10px;
     }
+    .seal {
+      position: absolute;
+      right: 100px;
+      top: 120px;
+      width: 150px;
+      height: 150px;
+      /*opacity: 0.5;*/
+      z-index: -1;
+    }
   </style>
   <div id="print">
     <h4>
@@ -43,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>
@@ -79,6 +88,7 @@
         </td>
       </tr>
     </table>
+    <img class="seal" border="0" :src="src" alt="">
   </div>
 
   <print-element v-show="false" v-ref:print id='print' styleid='style'
@@ -87,7 +97,7 @@
 </template>
 
 <script>
-import { isEmpty } from '../../../Util'
+import { isEmpty } from '../../../../Util'
 Date.prototype.Format = function (fmt) {
   var o = {
     "M+": this.getMonth() + 1, //月份
@@ -111,9 +121,14 @@ export default {
   },
   ready () {
   },
+  methods: {
+  },
   computed: {
     orgs () {
       return this.$login.f.orgs
+    },
+    src () {
+      return require(`./img/${this.$login.f.number}.png`)
     }
   }
 }

package/src/components/product/Process/Processes/{printRefund.vue → Print/printRefund.vue}

@@ -50,7 +50,7 @@
           <tr>
             <td colspan="6">
               <span class="date">开票日期：{{ new Date().Format('yyyy年MM月dd日') }}</span>
-<!--              <span>收据编码：{{ charge.f_charge_number }}</span>-->
+              <span>工程编号：{{ selectdata.f_parent_apply_num }}</span>
               <span class="status">经办人：{{ username }}</span>
             </td>
           </tr>
@@ -98,7 +98,7 @@
 </template>
 
 <script>
-import { isEmpty } from '../../../Util'
+import { isEmpty } from '../../../../Util'
 Date.prototype.Format = function (fmt) {
   var o = {
     "M+": this.getMonth() + 1, //月份

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: {
@@ -627,13 +714,10 @@ export default {
             item.hidden = false
           }
         } else {
-          if (item.label === '保费开始日期' || item.label === '保费结束日期' || item.label === '险种' || item.label === '保费金额') {
+          if (item.label === '保费开始日期' || item.label === '保费结束日期' || item.label === '险种' || item.label === '保费金额' || item.label === '保险备注') {
             item.hidden = true
             item.required = false
           }
-          if (item.label === '保险备注') {
-            item.hidden = true
-          }
         }
       }
     },
@@ -693,13 +777,10 @@ export default {
           }
         }
         if (f_is_insure === '否') {
-          if (item.label === '保费开始日期' || item.label === '保费结束日期' || item.label === '险种' || item.label === '保费金额') {
+          if (item.label === '保费开始日期' || item.label === '保费结束日期' || item.label === '险种' || item.label === '保费金额' || item.label === '保险备注') {
             item.hidden = true
             item.required = false
           }
-          if (item.label === '保险备注') {
-            item.hidden = true
-          }
         }
       }
     },
@@ -850,65 +931,21 @@ export default {
         }
       }
     },
+    // 团购转散户初始化
+    'apply2ReadyEvent' () {
+      if (this.show_data.f_apply_source === '线下发起') {
+        this.addressInitialization()
+        this.hideLabels('用户编号')
+        this.electiveLabels('用户编号')
+      }
+      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'() {
@@ -938,7 +975,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 === '街道/乡镇' ||