apply-clients 4.1.75 → 4.1.76

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "4.1.75",
+  "version": "4.1.76",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {
@@ -95,7 +95,7 @@
     "system-clients": "3.1.87",
     "system-phone": "1.1.18",
     "url-loader": "^0.5.7",
-    "vue-client": "1.23.10",
+    "vue-client": "1.24.39",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",

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

@@ -17,7 +17,7 @@
               </div>
               <div class="form-group col-sm-5 button-range">
                 <button class="button_new button_spacing" style="width: max-content"
-                        v-if="this.$login.f.rolesnames.indexOf('市场部报装') !== -1 || this.$login.f.rolesnames.indexOf('工程部报装') !== -1"
+                        v-if="$parent.$parent.projectStart"
                         @click="$parent.$parent.showModal = !$parent.$parent.showModal">工程发起</button>
                 <button  class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
                 <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
@@ -322,6 +322,9 @@
       }
     },
     computed: {
+      projectStart () {
+        return this.$login.r.includes('报建发起')
+      }
     },
     watch: {
       'model.rows': {

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

@@ -73,7 +73,7 @@
                   type="button"
                   name="button"
                   class="btn btn-link"
-                  :disabled="$parent.$parent.mark === 1 || row.f_charging_status === '作废'"
+                  :disabled="$parent.$parent.mark === 1 || row.f_charge_status === '作废'"
                   @click="$parent.$parent.showInvalidModal(row)"
                 >作废</button>
 

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

@@ -542,6 +542,14 @@ export default {
       }))
     },
     async buttonBefore(model) {
+      if (model.defname === '报建登记' && model.button.button_name === '提交') {
+
+          if (model.f_is_user === '是') {
+            if (isEmpty(model.f_user_name) || isEmpty(model.f_phone) || isEmpty(model.f_address)) {
+              throw '用户信息未填写完整，无法提交！！！'
+            }
+          }
+      }
       if (
         model.button.button_name === '提交' &&
         model.defname === '收费' &&

package/src/components/product/ServiceView.vue

@@ -521,7 +521,7 @@
             }
           }
           // 任何选择框只要是否都不能提交
-          if (item.type === 'select' && item.value === '否' && item.disabledButton) {
+          if (item.type === 'select' && (item.value === '否' || item.value === '未开工') && item.disabledButton) {
             flag = true
           }
         }

package/src/components/product/Stop/StopApplyList.vue

@@ -202,7 +202,7 @@ export default {
       }),
       curorgid: [this.$login.f.orgid],
       applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
-      defnames: [{label: '全部', value: ''}], // 流程节点
+      defnames: [{label: '全部', value: ''}, ...this.$appdata.getParam('办理环节')], // 流程节点
       applyNatures: [{label: '全部', value: ''}], // 报建性质
       criteriaShow: false
     }
@@ -232,7 +232,7 @@ export default {
 
         this.applyNatures = isEmpty(this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type}性质`)) ? [{label: '全部', value: ''}] : [{label: '全部', value: ''}, ...this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type}性质`)]
       } else {
-        this.defnames = [{label: '全部', value: ''}]
+        this.defnames = [{label: '全部', value: ''}, ...this.$appdata.getParam('办理环节')]
 
         this.applyNatures = [{label: '全部', value: ''}]
       }