gjy 3 jaren geleden
bovenliggende
commit
a23885b15c
1 gewijzigde bestanden met toevoegingen van 101 en 39 verwijderingen
  1. 101 39
      src/views/houseSelfCollect/inspectionManagementNew.vue

+ 101 - 39
src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -57,27 +57,99 @@
                 <ws-form-item v-if='serviceManagementType==3' label="业务编号" span="1" prop="qualityNo">
                   <ws-input v-model="deptBudgetList.qualityNo" placeholder="自动获取,不可编辑" maxlength="100" disabled size="small" />
                 </ws-form-item>
-                <ws-form-item label="仓位号" span="1" prop="inOutTaskNo">
+                <ws-form-item v-if='serviceManagementType==3' label="购粮性质" span="1" prop="natureOfGrainPurchase">
+                  <ws-input v-model="deptBudgetList.natureOfGrainPurchase" placeholder="请输入购粮性质" maxlength="10" size="small"
+                    :disabled="disabled" />
+                </ws-form-item>
+                <ws-form-item v-if='serviceManagementType==1' label="仓位号" span="1" prop="inOutTaskNo">
                   <el-select :disabled='recheck' filterable clearable v-model="deptBudgetList.binNumber" placeholder="请选择仓位号" class="typeselect" @change="binNumberChange">
                     <el-option v-for="item in positionInfos" :key="item.id" :label="item.binNumber" :value="item.binNumber" />
                   </el-select>
                 </ws-form-item>
-                <ws-form-item v-if='serviceManagementType==1' label="业务编号" span="1" prop="qualityNo">
-                  <ws-input v-model="deptBudgetList.qualityNo" placeholder="自动获取,不可编辑" maxlength="100" disabled size="small" />
+               
+                <ws-form-item v-if='serviceManagementType==3' label="货名" span="1" prop="inOutTaskNo">
+                  <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>
-                <ws-form-item v-if='serviceManagementType==3' label="客户" span="1" prop="customerName">
+                 <ws-form-item v-if='serviceManagementType==3' label="类型" span="1" prop="type">
+                  <ws-select v-model="deptBudgetList.type" disabled>
+                    <ws-option v-for="item in typeList" :key="'leixin'+item" :label="item" :value="item" />
+                  </ws-select>
+                </ws-form-item>
+                
+                <ws-form-item v-if='serviceManagementType==3' label="仓位号" span="1" prop="inOutTaskNo">
+                  <el-select :disabled='recheck' filterable clearable v-model="deptBudgetList.binNumber" placeholder="请选择仓位号" class="typeselect" @change="binNumberChange">
+                    <el-option v-for="item in positionInfos" :key="item.id" :label="item.binNumber" :value="item.binNumber" />
+                  </el-select>
+                </ws-form-item>
+                <ws-form-item label="箱号-1" span="1" prop="boxNo" v-if="serviceManagementType==3">
+                  <ws-input  :disabled='recheck' v-model="deptBudgetList.boxNo" placeholder="请输入箱号" maxlength="20" size="small" />
+                </ws-form-item>
+                
+                
+                <ws-form-item v-if='serviceManagementType==3' label="囤位号" span="1" prop="storageTagNo">
+                  <ws-input :disabled='recheck' v-model="deptBudgetList.storageTagNo" placeholder="选填,1-10个字符" maxlength="10" size="small" />
+                </ws-form-item>
+                <ws-form-item label="封号-1" span="1" prop="titleNo" v-if="serviceManagementType==3">
+                  <ws-input  :disabled='recheck' v-model="deptBudgetList.titleNo" placeholder="请输入封号" maxlength="20" size="small" />
+                </ws-form-item>
+                
+                <ws-form-item v-if='serviceManagementType==3' label="运输方式" span="1" prop="outType">
+                  <el-select v-if='serviceManagementType==3' @change='outTypechange' :disabled='recheck' v-model="outType" placeholder="请选择运输方式">
+                    <el-option v-for="item in multiSelector1" :key="item.id" :label="item.type+'('+item.contractNo+' '+item.seller+')'" :value="item.id" />
+                    <el-option  key="tayun1" label="他运" value="他运" />
+                  </el-select>
+                </ws-form-item>
+                <ws-form-item label="箱号-2" span="1" prop="boxNoOther" v-if="serviceManagementType==3">
+                  <ws-input :disabled='recheck' v-model="deptBudgetList.boxNoOther" placeholder="请输入箱号" maxlength="20" size="small" />
+                </ws-form-item>
+                 <ws-form-item v-if='serviceManagementType==3' label="客户" span="1" prop="customerName">
                   <el-select v-model="deptBudgetList.customerName" clearable filterable placeholder="请选择" class="typeselect"
                     @change="customerChange" :disabled="disabled1">
                     <el-option v-for="item in customerList" :key="'kehu'+item.valueKey" :label="item.value" :value="item.value" />
                   </el-select>
                 </ws-form-item>
-                <ws-form-item label="囤位号" span="1" prop="storageTagNo">
-                  <ws-input :disabled='recheck' v-model="deptBudgetList.storageTagNo" placeholder="选填,1-10个字符" maxlength="10" size="small" />
+                <ws-form-item label="封号-2" span="1" prop="titleNoOther" v-if="serviceManagementType==3">
+                  <ws-input :disabled='recheck' v-model="deptBudgetList.titleNoOther" placeholder="请输入封号" maxlength="20" size="small" />
                 </ws-form-item>
-                <ws-form-item v-if='serviceManagementType==3' label="购粮性质" span="1" prop="natureOfGrainPurchase">
-                  <ws-input v-model="deptBudgetList.natureOfGrainPurchase" placeholder="请输入购粮性质" maxlength="10" size="small"
-                    :disabled="disabled" />
+                <ws-form-item v-if="serviceManagementType==3" label="车牌号" span="1" prop="carNo">
+                  <ws-input :disabled="disabled2" v-if="options2.length == 0&&serviceManagementType==1 || serviceManagementType==3&&carNumberList.length==0" v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7"
+                  size="small" />
+                <el-select :disabled="disabled2" v-if="carstatus && options2.length > 0 && serviceManagementType!=3" filterable clearable v-model="deptBudgetList.carNo" placeholder="请选择车牌号" class="typeselect" @change="carChange($event,0)">
+                  <el-option v-for="(item,index) in options2" :key="index"
+                    :label="item.carNo + '(' + item.tranCarNo + ')'" :value="index" />
+                </el-select>
+                <el-select :disabled="disabled2" v-if="!carstatus && options2.length > 0 && serviceManagementType!=3" filterable clearable :filter-method="dataFilter2"
+                  v-model="deptBudgetList.carNo" placeholder="请选择车牌号" class="typeselect" @change="carChange($event,0)">
+                  <el-option v-for="item in options2" :key="item.constKey" :label="item.carNo" :value="item.carNo" />
+                </el-select>
+                <el-select :disabled="disabled2" v-if="carNumberList.length > 0 && serviceManagementType==3" filterable clearable :filter-method="dataFilter2"
+                  v-model="deptBudgetList.carNo" placeholder="请选择车牌号" class="typeselect" @change="carChange($event,1)">
+                  <el-option v-for="item in carNumberList" :key="item.constKey" :label="item.carNo" :value="item.carNo" />
+                </el-select>
+                  <!-- <el-select @change='carchange' v-if="statusTypetext=='初检'&&editcar==false&&carstatus||statusTypetext=='确认'&&editcar==false&&carstatus" v-model="deptBudgetList.carNo" placeholder="请选择车牌号">
+                    <el-option v-for="(item,index) in options2" :key="item.value" :label="item.carNo + '(' + item.tranCarNo + ')'" :value="index"  />
+                  </el-select>
+                  <el-select @change='carchange' v-if="statusTypetext=='初检'&&editcar==false&&!carstatus||statusTypetext=='确认'&&editcar==false&&!carstatus" v-model="deptBudgetList.carNo" placeholder="请选择车牌号">
+                    <el-option v-for="(item,index) in options2" :key="item.value" :label="item.carNo" :value="index"  />
+                  </el-select>
+                  <ws-input v-if="statusTypetext=='复检'||editcar" :disabled="disabled2" v-model="deptBudgetList.carNo" placeholder="请输入车牌号" size="small" type="number" @mousewheel.native.prevent />
+                  <img v-if="statusTypetext=='初检'||statusTypetext=='确认'" width="17" height="18" style="
+                      vertical-align: text-top;
+                      position: relative;
+                      top: -1px;
+                    " src="../../../public/img/edit.png" @click="editClick(3)" alt="" /> -->
                 </ws-form-item>
+                <ws-form-item v-if='serviceManagementType==1' label="业务编号" span="1" prop="qualityNo">
+                  <ws-input v-model="deptBudgetList.qualityNo" placeholder="自动获取,不可编辑" maxlength="100" disabled size="small" />
+                </ws-form-item>
+               
+                <ws-form-item v-if='serviceManagementType==1' label="囤位号" span="1" prop="storageTagNo">
+                  <ws-input :disabled='recheck' v-model="deptBudgetList.storageTagNo" placeholder="选填,1-10个字符" maxlength="10" size="small" />
+                </ws-form-item>
+                
                 <ws-form-item v-if='deptBudgetList.outType=="移库入库"&&serviceManagementType==1' label="移库编号" span="1" prop="contractNo">
                   <ws-input v-model="deptBudgetList.contractNo" placeholder="自动获取,不可编辑" maxlength="100" disabled size="small" />
                 </ws-form-item>
@@ -96,20 +168,11 @@
                 <ws-form-item v-if='serviceManagementType==1' label="货名" span="1" prop="inOutTaskNo">
                   <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 :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>
+                
                 <ws-form-item v-if='statusTypetext!="初检"&&serviceManagementType==1' label="经办人" span="1" prop="agent">
                   <ws-input v-model="deptBudgetList.agent" placeholder="自动获取,不可编辑" maxlength="100" disabled size="small" />
                 </ws-form-item>
-                <ws-form-item v-if='serviceManagementType==3' label="类型" span="1" prop="type">
-                  <ws-select v-model="deptBudgetList.type" disabled>
-                    <ws-option v-for="item in typeList" :key="'leixin'+item" :label="item" :value="item" />
-                  </ws-select>
-                </ws-form-item>
+                
                 <ws-form-item v-if='statusTypetext=="初检"&&serviceManagementType==1' label="运费(元/吨)" span="1" prop="freight">
                   <ws-input :disabled="disabledfright" v-model="deptBudgetList.freight" placeholder="请输入运费" size="small" type="number" @mousewheel.native.prevent />
                   <img width="17" height="18" style="
@@ -126,21 +189,17 @@
                 <ws-form-item v-if='serviceManagementType==1' label="入库日期" span="1" prop="inOutDate" class="deliverydate">
                   <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 :disabled='disablednotarize||recheck' v-if='serviceManagementType==1' v-model="deptBudgetList.outType" placeholder="请选择运输方式">
+                <ws-form-item v-if='serviceManagementType==1' label="运输方式" span="1" prop="outType">
+                  <el-select :disabled='disablednotarize||recheck' 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="请选择运输方式">
-                    <el-option v-for="item in multiSelector1" :key="item.id" :label="item.type+'('+item.contractNo+' '+item.seller+')'" :value="item.id" />
-                    <el-option  key="tayun1" label="他运" value="他运" />
-                  </el-select>
                 </ws-form-item>
                 <ws-form-item  v-if='serviceManagementType==1||serviceManagementType==3&&deptBudgetList.outType=="自运"' label="车队" span="1" prop="fleetName">
                   <el-select  :disabled='recheck' v-model="deptBudgetList.fleet" placeholder="非车队车辆">
                     <el-option v-for="item in fleetNameList" :key="item.value" :label="item.fleetName" :value="item.fleetName" />
                   </el-select>
                 </ws-form-item>
-                <ws-form-item label="车牌号" span="1" prop="carNo">
+                <ws-form-item v-if="serviceManagementType==1" label="车牌号" span="1" prop="carNo">
                   <ws-input :disabled="disabled2" v-if="options2.length == 0&&serviceManagementType==1 || serviceManagementType==3&&carNumberList.length==0" v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7"
                   size="small" />
                 <el-select :disabled="disabled2" v-if="carstatus && options2.length > 0 && serviceManagementType!=3" filterable clearable v-model="deptBudgetList.carNo" placeholder="请选择车牌号" class="typeselect" @change="carChange($event,0)">
@@ -168,26 +227,19 @@
                       top: -1px;
                     " src="../../../public/img/edit.png" @click="editClick(3)" alt="" /> -->
                 </ws-form-item>
-                <ws-form-item label="箱号-1" span="1" prop="boxNo" v-if="deptBudgetList.outType == '汽运' ||deptBudgetList.outType == '集装箱船'||serviceManagementType==3">
+                <ws-form-item label="箱号-1" span="1" prop="boxNo" v-if="deptBudgetList.outType == '汽运' ||deptBudgetList.outType == '集装箱船'">
                   <ws-input  :disabled='recheck' v-model="deptBudgetList.boxNo" placeholder="请输入箱号" maxlength="20" size="small" />
                 </ws-form-item>
-                <ws-form-item label="封号-1" span="1" prop="titleNo" v-if="deptBudgetList.outType == '汽运' ||deptBudgetList.outType == '集装箱船'||serviceManagementType==3">
+                <ws-form-item label="封号-1" span="1" prop="titleNo" v-if="deptBudgetList.outType == '汽运' ||deptBudgetList.outType == '集装箱船'">
                   <ws-input  :disabled='recheck' v-model="deptBudgetList.titleNo" placeholder="请输入封号" maxlength="20" size="small" />
                 </ws-form-item>
-                <ws-form-item label="箱号-2" span="1" prop="boxNoOther" v-if="deptBudgetList.outType == '汽运' ||deptBudgetList.outType == '集装箱船'||serviceManagementType==3">
+                <ws-form-item label="箱号-2" span="1" prop="boxNoOther" v-if="deptBudgetList.outType == '汽运' ||deptBudgetList.outType == '集装箱船'">
                   <ws-input :disabled='recheck' v-model="deptBudgetList.boxNoOther" placeholder="请输入箱号" maxlength="20" size="small" />
                 </ws-form-item>
-                <ws-form-item label="封号-2" span="1" prop="titleNoOther" v-if="deptBudgetList.outType == '汽运' ||deptBudgetList.outType == '集装箱船'||serviceManagementType==3">
+                <ws-form-item label="封号-2" span="1" prop="titleNoOther" v-if="deptBudgetList.outType == '汽运' ||deptBudgetList.outType == '集装箱船'">
                   <ws-input :disabled='recheck' v-model="deptBudgetList.titleNoOther" placeholder="请输入封号" maxlength="20" size="small" />
                 </ws-form-item>
-                  <ws-form-item label="净重单价(元/公斤)" span="1" prop="tidalGrainPrice" v-if="deptBudgetList.type == '潮粮' && serviceManagementType == 3">
-                  <ws-input type="number" @mousewheel.native.prevent v-model="deptBudgetList.tidalGrainPrice" placeholder="请输入净重单价"
-                    maxlength="10" size="small"  />
-                </ws-form-item>
-                <ws-form-item label="干粮单价(元/公斤)" span="2" prop="dryGrainPrice" v-if="deptBudgetList.type == '干粮' && serviceManagementType == 3">
-                  <ws-input type="number" @mousewheel.native.prevent v-model="deptBudgetList.dryGrainPrice" placeholder="请输入干粮单价"
-                    maxlength="10" size="small"  />
-                </ws-form-item>
+                  
               </ws-info-table>
 
               <div class="title">质检数据</div>
@@ -244,6 +296,16 @@
                     @mousewheel.native.prevent placeholder="请输入不完善粒占比" maxlength="40" size="small" />
                 </ws-form-item>
               </ws-info-table>
+              <ws-info-table>
+                <ws-form-item label="净重单价(元/公斤)" span="1" prop="tidalGrainPrice" v-if="deptBudgetList.type == '潮粮' && serviceManagementType == 3">
+                  <ws-input type="number" @mousewheel.native.prevent v-model="deptBudgetList.tidalGrainPrice" placeholder="请输入净重单价"
+                    maxlength="10" size="small"  />
+                </ws-form-item>
+                <ws-form-item label="干粮单价(元/公斤)" span="2" prop="dryGrainPrice" v-if="deptBudgetList.type == '干粮' && serviceManagementType == 3">
+                  <ws-input type="number" @mousewheel.native.prevent v-model="deptBudgetList.dryGrainPrice" placeholder="请输入干粮单价"
+                    maxlength="10" size="small"  />
+                </ws-form-item>
+              </ws-info-table>
               <ws-info-table>
                   <el-form-item  class='rememo' v-if='statusTypetext!="初检"' label="复检" span="1" prop="imperfectGrain">
                   <ws-input