前端更新sdy

src/views/houseSelfCollect/inspectInfo.vue

@@ -54,12 +54,9 @@
                 :disabled="disabled" />
             </ws-form-item>
             <ws-form-item v-else label="扣杂" span="1" prop="buckleWeightRatio">
-              <ws-input type="number" @mousewheel.native.prevent v-model="inspect.buckleMiscellaneous" @input="waterContentChange" 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-input type="number" @mousewheel.native.prevent v-model="inspect.buckleMiscellaneous" @input="waterContentChange" 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>
             <ws-form-item label="类型" span="1" prop="type">
               <ws-select v-model="inspect.type" :disabled="disabled" @change="typeChange">
@@ -92,8 +89,7 @@
                 :disabled="disabled" />
             </ws-form-item>
             <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 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' 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"

src/views/houseSelfCollect/inspectionManagement.vue

@@ -66,7 +66,17 @@
       <el-table-column prop="customerName" label="客户"></el-table-column>
       <el-table-column prop="carNumber" label="车牌号"></el-table-column>
       <el-table-column prop="goodsName" label="货名"></el-table-column>
-      <el-table-column prop="waterContent" label="水分（%）"></el-table-column>
+      <el-table-column prop="waterContent" label="水分（%）">
+        <template scope="scope">
+          <span>{{scope.row.waterContent}} | {{scope.row.reWaterContent ? scope.row.reWaterContent : '未复检' }}</span>
+        </template>
+      </el-table-column>
+       <el-table-column prop="buckleMiscellaneous" label="扣杂">
+         <template scope="scope">
+           <div v-if="scope.row.paramType == 1"> <span>{{scope.row.buckleMiscellaneous}} | {{scope.row.reBuckleMiscellaneous ? scope.row.reBuckleMiscellaneous : '未复检'}}</span></div>
+         <!-- <div v-else>{{scope.row.reBuckleMiscellaneous}}</div> -->
+        </template>
+       </el-table-column>
        <el-table-column prop="type" label="类型"></el-table-column>
       <el-table-column
         prop="tidalGrainPrice"