Browse Source

Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

mxx 3 years ago
parent
commit
29d75dc252
1 changed files with 5 additions and 5 deletions
  1. 5 5
      src/views/houseSelfCollect/inspectInfo.vue

+ 5 - 5
src/views/houseSelfCollect/inspectInfo.vue

@@ -56,8 +56,8 @@
             <ws-form-item v-else label="扣杂" span="1" prop="buckleWeightRatio">
               <ws-input type="number" @mousewheel.native.prevent v-model="inspect.buckleMiscellaneous" placeholder="请输入扣杂" maxlength="100" size="small"
                 :disabled="disabled" />
-                <ws-input v-if='types==4||inspect.reBuckleMiscellaneous!=null' type="number" @mousewheel.native.prevent v-model="inspect.reBuckleMiscellaneous" placeholder="请输入扣杂" maxlength="100" size="small"
-                :disabled="disabled" />
+                <ws-input v-if='types==4' type="number" @mousewheel.native.prevent v-model="inspect.reBuckleMiscellaneous" placeholder="请输入扣杂" maxlength="100" size="small"
+                />
                 <ws-input v-else type="number" @mousewheel.native.prevent v-model="inspect.reBuckleMiscellaneous" placeholder="未复检" maxlength="100" size="small"
                 disabled />
             </ws-form-item>
@@ -94,8 +94,8 @@
             <ws-form-item label="水分(%)" span="1" prop="waterContent">
               <ws-input type="number" @mousewheel.native.prevent v-model="inspect.waterContent" placeholder="请输入水分占比" maxlength="100" size="small"
                 @change="waterContentChange('water')" :disabled="disabled" />
-                <ws-input v-if='types==4||inspect.reWaterContent!=null' type="number" @mousewheel.native.prevent v-model="inspect.reWaterContent" placeholder="请输入水分占比" maxlength="100" size="small"
-                :disabled="disabled" />
+                <ws-input v-if='types==4' type="number" @mousewheel.native.prevent v-model="inspect.reWaterContent" placeholder="请输入水分占比" maxlength="100" size="small"
+                />
                 <ws-input v-else type="number" @mousewheel.native.prevent v-model="inspect.reWaterContent" placeholder="未复检" maxlength="100" size="small"
                 disabled />
             </ws-form-item>
@@ -221,7 +221,7 @@
         this.disabled1 = true
         this.information = '编辑'
       }else if (this.types == 4) {
-        this.disabled = false
+        this.disabled = true
         this.disabled1 = true
         this.information = '编辑'
       }else if (this.types == 5) {