前端

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -97,8 +97,8 @@
                   <ws-input v-model="deptBudgetList.goodsName" placeholder="自动获取，不可编辑" maxlength="100" disabled size="small" />
                 </ws-form-item>
                 <ws-form-item v-if='serviceManagementType==3' label="货名" span="1" prop="inOutTaskNo">
-                  <el-select v-model="deptBudgetList.goodsName" clearable filterable placeholder="请选择" class="typeselect"
-                    @change="goodsNameChange" :disabled="goodsdisabled">
+                  <el-select :disabled='disablednotarize||goodsdisabled' v-model="deptBudgetList.goodsName" clearable filterable placeholder="请选择" class="typeselect"
+                    @change="goodsNameChange" >
                     <el-option v-for="item in goodnameList" :key="'huoming'+item.id" :label="item.goodsName" :value="item.goodsName" />
                   </el-select>
                 </ws-form-item>
@@ -127,7 +127,7 @@
                   <el-date-picker :disabled='recheck' v-model="deptBudgetList.inOutDate" placeholder="请选择入库日期" type="date" value-format="yyyy-MM-dd"></el-date-picker>
                 </ws-form-item>
                 <ws-form-item label="运输方式" span="1" prop="outType">
-                  <el-select v-if='serviceManagementType==1' :disabled='recheck' v-model="deptBudgetList.outType" placeholder="请选择运输方式">
+                  <el-select :disabled='disablednotarize||recheck' v-if='serviceManagementType==1' v-model="deptBudgetList.outType" placeholder="请选择运输方式">
                     <el-option v-for="item in multiSelector" :key="'ysfs'+item.value" :label="item.name" :value="item.name" />
                   </el-select>
                   <el-select v-if='serviceManagementType==3' @change='outTypechange' :disabled='recheck' v-model="outType" placeholder="请选择运输方式">
@@ -193,52 +193,52 @@
               <div class="title">质检数据</div>
               <ws-info-table>
                 <ws-form-item label="等级" span="1" prop="outType">
-                  <ws-select v-if='statusTypetext!="复检"' v-model="deptBudgetList.grade" placeholder class="typeselect" @change="selectpackingMethod">
+                  <ws-select style="margin-right:10px;" v-if='statusTypetext!="复检"' v-model="deptBudgetList.grade" placeholder class="typeselect" @change="selectpackingMethod">
                     <ws-option v-for="item in gradeList" :key="item.constKey" :label="item.constValue"
                     :value="item.constValue" />
                   </ws-select>
-                  <ws-select v-if='statusTypetext!="初检"' v-model="deptBudgetList.reGrade" placeholder class="typeselect" @change="reselectpackingMethod">
+                  <ws-select :disabled='disablednotarize' v-if='statusTypetext!="初检"' v-model="deptBudgetList.reGrade" placeholder class="typeselect" @change="reselectpackingMethod">
                     <ws-option v-for="item in gradeList" :key="item.constKey" :label="item.constValue"
                     :value="item.constValue" />
                   </ws-select>
                 </ws-form-item>
                 <ws-form-item label="水分（%）" span="1" prop="waterContent">
-                  <ws-input @change="waterContentChange('water')" v-if='statusTypetext!="复检"' v-model="deptBudgetList.waterContent" type="number"
+                  <ws-input style="margin-right:10px;" @change="waterContentChange('water')" v-if='statusTypetext!="复检"' v-model="deptBudgetList.waterContent" type="number"
                     @mousewheel.native.prevent placeholder="请输入水分占比" maxlength="40" size="small" />
                     <ws-input  :disabled='disablednotarize' v-if='statusTypetext!="初检"' v-model="deptBudgetList.reWaterContent" type="number"
                     @mousewheel.native.prevent placeholder="请输入水分占比" maxlength="40" size="small" />
                 </ws-form-item>
                 <!--杂质（%）<=-->
                 <ws-form-item label="杂质（%）" span="1" prop="impurity">
-                  <ws-input v-if='statusTypetext!="复检"' v-model="deptBudgetList.impurity" type="number" @mousewheel.native.prevent
+                  <ws-input style="margin-right:10px;" v-if='statusTypetext!="复检"' v-model="deptBudgetList.impurity" type="number" @mousewheel.native.prevent
                     placeholder="请输入杂质占比" maxlength="40" size="small" />
                   <ws-input :disabled='disablednotarize' v-if='statusTypetext!="初检"' v-model="deptBudgetList.reImpurity" type="number" @mousewheel.native.prevent
                     placeholder="请输入杂质占比" maxlength="40" size="small" />
                 </ws-form-item>
                 <!--容重(克/升)-->
                 <ws-form-item label="容重(克/升)" span="1" prop="bulkDensity">
-                  <ws-input v-if='statusTypetext!="复检"' v-model="deptBudgetList.bulkDensity" type="number" @mousewheel.native.prevent
+                  <ws-input style="margin-right:10px;" v-if='statusTypetext!="复检"' v-model="deptBudgetList.bulkDensity" type="number" @mousewheel.native.prevent
                     placeholder="请输入容重" maxlength="40" size="small" />
                   <ws-input :disabled='disablednotarize' v-if='statusTypetext!="初检"' v-model="deptBudgetList.reBulkDensity" type="number" @mousewheel.native.prevent
                     placeholder="请输入容重" maxlength="40" size="small" />
                 </ws-form-item>
                 <!--霉变粒（%）<=-->
                 <ws-form-item label="霉变粒（%）" span="1" prop="mildewGrain">
-                  <ws-input v-if='statusTypetext!="复检"' v-model="deptBudgetList.mildewGrain" type="number" @mousewheel.native.prevent
+                  <ws-input style="margin-right:10px;" v-if='statusTypetext!="复检"' v-model="deptBudgetList.mildewGrain" type="number" @mousewheel.native.prevent
                     placeholder="请输入霉变粒占比" maxlength="40" size="small" />
                   <ws-input :disabled='disablednotarize' v-if='statusTypetext!="初检"' v-model="deptBudgetList.reMildewGrain" type="number" @mousewheel.native.prevent
                     placeholder="请输入霉变粒占比" maxlength="40" size="small" />
                 </ws-form-item>
                 <!--热损伤（%）<=-->
                 <ws-form-item label="热损伤（%）" span="1" prop="jiaorenli">
-                  <ws-input v-if='statusTypetext!="复检"' v-model="deptBudgetList.jiaorenli" type="number" @mousewheel.native.prevent
+                  <ws-input style="margin-right:10px;" v-if='statusTypetext!="复检"' v-model="deptBudgetList.jiaorenli" type="number" @mousewheel.native.prevent
                     placeholder="请输入热损伤占比" maxlength="40" size="small" />
                   <ws-input :disabled='disablednotarize' v-if='statusTypetext!="初检"' v-model="deptBudgetList.reJiaorenli" type="number" @mousewheel.native.prevent
                     placeholder="请输入热损伤占比" maxlength="40" size="small" />
                 </ws-form-item>
                 <!--不完善粒（%）<=-->
                 <ws-form-item label="不完善粒（%）" span="1" prop="imperfectGrain">
-                  <ws-input v-if='statusTypetext!="复检"' v-model="deptBudgetList.imperfectGrain" type="number"
+                  <ws-input style="margin-right:10px;" v-if='statusTypetext!="复检"' v-model="deptBudgetList.imperfectGrain" type="number"
                     @mousewheel.native.prevent placeholder="请输入不完善粒占比" maxlength="40" size="small" />
                   <ws-input :disabled='disablednotarize' v-if='statusTypetext!="初检"' v-model="deptBudgetList.reImperfectGrain" type="number"
                     @mousewheel.native.prevent placeholder="请输入不完善粒占比" maxlength="40" size="small" />
@@ -424,7 +424,7 @@
         warehouseList:[],
         warehouseList1:[],
         serviceManagementType:1,
-        statusType:0,
+        statusType:1,
         positionInfos:[],
         statusTypetext:'初检',
         directselling:false,
@@ -1062,18 +1062,23 @@
         if(status=='初检'){
           this.disabled2=false
           this.deptBudgetList.statusType=1
+          this.statusType=this.deptBudgetList.statusType
           this.recheck=false
         }else if(status=='复检'){
           this.deptBudgetList.statusType=1
           this.recheck=true
           this.disabled2=true
+          this.statusType=0
           this.isSelectType=true
         }else if(status=='确认'){
           this.deptBudgetList.statusType=3
           this.recheck=false
           this.disablednotarize=true
+          this.statusType=0
           this.disabled2=false
         }
+        
+        this.getList()
       },
       submit(){
         if (this.reader) {
@@ -2298,6 +2303,7 @@
             pageSize: this.pageSize,
             warehouseName: this.warehouseName,
             managementType: 1,
+            statusType:this.statusType,
             serviceManagementType:this.serviceManagementType
           })
           .toPromise()