apply-clients 5.0.35-41 → 5.0.35-42

package/package.json

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

package/src/components/app_apply/ezhou/ServiceView.vue

@@ -174,7 +174,7 @@
             </div>
           </div>
         </div>
-        <div class="form-group col-sm-11" v-show="isshow">
+        <div class="form-group col-sm-11" v-show="true">
           <label class="text-left font">用户签名</label>
           <div class="auto">
             <div class="panel">
@@ -481,6 +481,9 @@ export default {
           if (this.data.fields[i].type === 'datepicker' && !this.data.fields[i].value) {
             this.data.fields[i].value = new Date().Format("yyyy-MM-dd HH:mm:ss")
           }
+          if(this.data.fields[i].label==='小区名称' && this.data.f_user_type ==='非民用'){
+            this.data.fields[i].required = false
+          }
           if (this.data.fields[i].label==='气价名称'){
             console.log(this.data.fields[i].options)
             let data={
@@ -577,7 +580,7 @@ export default {
     // 点击按钮
     clicked(index, button) {
       console.log(`点击了按钮index:${index}+button:${JSON.stringify(button)}`);
-      if (this.data.title != '现场勘查' && this.data.title != '现场勘查定价' && button.button_name=='提交') {
+      if (button.button_name=='提交') {
         if (!this.model.f_overall_imgs || this.model.f_overall_imgs.length == 0){
           this.$showMessage("必须有现场照片")
           return;
@@ -593,12 +596,12 @@ export default {
       }
 
 
-      if ((this.data.title == '现场勘查' || this.data.title == '现场勘查定价') && button.button_name=='提交') {
-        if (!this.model.f_overall_imgs || this.model.f_overall_imgs.length == 0){
-          this.$showMessage("必须有现场照片")
-          return;
-        }
-      }
+      // if ((this.data.title == '现场勘查' || this.data.title == '现场勘查定价') && button.button_name=='提交') {
+      //   if (!this.model.f_overall_imgs || this.model.f_overall_imgs.length == 0){
+      //     this.$showMessage("必须有现场照片")
+      //     return;
+      //   }
+      // }
       if (this.kchege == 'true') {
         console.log(this.model.f_hege)
         if (this.model.f_hege != 'true') {
@@ -712,7 +715,7 @@ export default {
         // }
         // this.$set('data.fields[8].value', money)
         // this.$set('data.fields[9].value', money)
-        if (index == 10) {
+        if (index == 7) {
           console.log("1111111111" + value)
           if (value == '合格') {
             this.kchege = true