mxx 3 лет назад
Родитель
Сommit
68dac3a654

+ 0 - 1
src/components/Tinymce/components/editorImage.vue

@@ -419,7 +419,6 @@ export default {
     },
 
     getFilePath (path) {
-      // debugger
       // if (this.vesselBankFlag === "V") {
       // const sysUrl = "http://" + window.location.host + "/";
       const sysUrl = this.$store.getters.baseInfo.fileUrl

+ 0 - 1
src/components/WsUpload/index.vue

@@ -603,7 +603,6 @@ export default {
     },
 
     clearFiles() {
-      // debugger
       this.fileList = []
     },
     // 反斜杠转斜杠

+ 0 - 1
src/store/modules/user.js

@@ -213,7 +213,6 @@ const actions = {
   },
 
   async getBaseInfo({ commit }, params) {
-    // debugger
     if (process.env.VUE_APP_PACKAGE_ENV === 'ship') {
       findVesselSysVersion().toPromise().then(res => {
         let loginAddress = 'http://' + res.localHostAddress + ':81/'

+ 0 - 1
src/views/home/index.vue

@@ -418,7 +418,6 @@ export default {
     //         : sessionStorage.getItem('ws-pf_deptId'),
     //     compId: sessionStorage.getItem('ws-pf_compId')
     //   }
-    //   // debugger
     //   // TODO: 【此处有问题】接口变更的不对
     //   queryCircularManagementReceiveList(data)
     //     .toPromise()

+ 0 - 1
src/views/houseSelfCollect/weightCheck.vue

@@ -530,7 +530,6 @@
         })
       },
       calculation() {
-        // debugger
         // if (this.weighingList.grossWeight && this.weighingList.tare) {
         //   this.weighingList.netWeight = this.weighingList.grossWeight - this.weighingList.tare - parseInt(this.weighingList.buckleMiscellaneous)
         //   this.weighingList.netWeight = this.weighingList.netWeight.toFixed(2)

+ 0 - 1
src/views/supply/spareParts/apply/components/addAppDetailTable.vue

@@ -254,7 +254,6 @@ export default {
     // 当列表输入数据大于0的时候 储存否则删除  deviceList
     addRowinfo (row, type) {
       if (type == false) {
-        // debugger;
         for (let i = 0; i < this.tableRowsInfo.length; i++) {
           if (this.tableRowsInfo[i].spId == row.spId) {
             this.setRowsInfo(row, i)

+ 0 - 1
src/views/supply/spareParts/inventoryManagement/components/inventoryVerificationDetail.vue

@@ -211,7 +211,6 @@ export default {
             }
             // id 相同品牌相同则覆盖元数据
             if (partList) {
-              // debugger;
               // this.applInfo.deviceList[i].partList[
               //   partListIndex
               // ] = Object.assign({}, this.tableRowsInfo[k]);

+ 0 - 1
src/views/system/shipInspection/selfReportAdd.vue

@@ -791,7 +791,6 @@ export default {
         }
       })
       if (row.result === 'NO') {
-        // debugger
         if (!this.compare(row, index)) {
           let obj = {
             defectTypeId: '',

+ 0 - 1
src/views/system/systemFile/systemFile.vue

@@ -102,7 +102,6 @@ export default {
       const allMenu = this.elMenu.filter(i => i.hp)
       if (allMenu.length > 0) {
         if (sessionStorage.getItem('ws-pf_systemFile')) {
-          // debugger
           for (let i = 0; i < allMenu.length; i++) {
             if (allMenu[i].hp && allMenu[i].key === sessionStorage.getItem('ws-pf_systemFile')) {
               return sessionStorage.getItem('ws-pf_systemFile')

+ 0 - 1
src/views/taskManagement/tranManagementTransportAdd.vue

@@ -1028,7 +1028,6 @@ export default {
           return
         }
       }
-      // debugger
       // if (this.deptBudgetList.endFlag=='1') {
         this.$confirm(`运输任务提交成功后将派发到物流部门,是否确定提交?`, {
           confirmButtonText: '确定',

+ 0 - 1
src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -1525,7 +1525,6 @@
 				//     this.deliveryType = response
 				//   })
 				//仓库名
-				// debugger
 				getwarehousename({
 						compId: this.compId,
 						warehouseType: 1

+ 0 - 1
src/views/tranManagement/tranManagementFireReceivingFeedback.vue

@@ -754,7 +754,6 @@ export default {
         that.$forceUpdate();
         that.freightspace[that.index].imgCount++
         console.log(that.freightspace[that.index].imgCount)
-        debugger
         if( that.freightspace[that.index].unloadPoundImg){
            that.freightspace[that.index].unloadPoundImg += ',' + e.url
         }else{

+ 0 - 1
src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -597,7 +597,6 @@ export default {
         type: 'warning',
       })
         .then(() => {
-          // debugger
               var tranProcessInfo = {}
               tranProcessInfo.id = this.deptBudgetList.id
               tranProcessInfo.flag = "1"

Разница между файлами не показана из-за своего большого размера
+ 1361 - 1657
src/views/warehouse/warehouseManagementGross.vue


Разница между файлами не показана из-за своего большого размера
+ 408 - 616
src/views/warehouse/warehouseManagementNoWeightIn.vue


Разница между файлами не показана из-за своего большого размера
+ 397 - 560
src/views/warehouse/warehouseManagementNoWeightOut.vue


+ 1300 - 1413
src/views/warehouse/warehouseManagementTare.vue

@@ -6,217 +6,108 @@
         <h2 class="bg-left title">{{information}}</h2>
       </el-col>
       <el-col :span="4" class="bg-right">
-        <el-button
-          class="bg-bottom"
-          type="primary"
-          size="small"
-          @click="revert()"
-          ><img
-            width="6"
-            height="10"
-            style="vertical-align: bottom; margin-right: 3px"
-            src="../../../public/img/lujing.png"
-            alt=""
-          />返回</el-button
-        >
+        <el-button class="bg-bottom" type="primary" size="small" @click="revert()"><img width="6" height="10"
+            style="vertical-align: bottom; margin-right: 3px" src="../../../public/img/lujing.png" alt="" />返回
+        </el-button>
       </el-col>
     </el-row>
     <ws-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules">
       <div class="basicInformation">
         <h2>
           {{ deptBudgetList.warehouseName }}
-          <span
-            class="position"
-            v-show="this.deptBudgetList.warehouseType == 1"
-          >
+          <span class="position" v-show="this.deptBudgetList.warehouseType == 1">
             {{ deptBudgetList.binNumber }}仓位
           </span>
           <span v-show="this.deptBudgetList.warehouseType == 2">(临)</span>
         </h2>
         <div class="small-title">基本信息</div>
         <ws-info-table>
-                  <!--任务编号-->
+          <!--任务编号-->
           <ws-form-item label="任务编号" span="1" prop="inOutTaskNo">
-            <el-select
-              filterable
-              clearable
-              v-model="deptBudgetList.inOutTaskNo"
-              placeholder="请选择任务编号"
-              class="typeselect"
-              @change="contractNoChange"
-            >
-              <el-option
-                v-for="item in deptBudgetList1"
-                :key="item.inOutTaskNo"
-                :label="item.inOutTaskNo"
-                :value="item.inOutTaskNo"
-              />
+            <el-select filterable clearable v-model="deptBudgetList.inOutTaskNo" placeholder="请选择任务编号"
+              class="typeselect" @change="contractNoChange">
+              <el-option v-for="item in deptBudgetList1" :key="item.inOutTaskNo" :label="item.inOutTaskNo"
+                :value="item.inOutTaskNo" />
             </el-select>
           </ws-form-item>
           <ws-form-item label="合同编号" span="1" prop="contractNo">
-            <ws-select
-              v-model="deptBudgetList.contractNo"
-              placeholder="请选择合同编号或移库任务编号"
-              class="typeselect"
-              @change='contractNoChange1'
-            >
-              <ws-option
-                v-for="item in outContractNo"
-                :key="item.constKey"
-                :label="item.contractNo"
-                :value="item.contractNo"
-              />
+            <ws-select v-model="deptBudgetList.contractNo" placeholder="请选择合同编号或移库任务编号" class="typeselect"
+              @change='contractNoChange1'>
+              <ws-option v-for="item in outContractNo" :key="item.constKey" :label="item.contractNo"
+                :value="item.contractNo" />
             </ws-select>
           </ws-form-item>
           <!-- 货名 -->
           <ws-form-item label="货名" span="1">
-            <ws-select
-            disabled
-              v-model="deptBudgetList.goodsName"
-              placeholder
-              class="typeselect"
-              @change="selectgoodsName"
-            >
-              <ws-option
-                v-for="item in goodnameList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              />
+            <ws-select disabled v-model="deptBudgetList.goodsName" placeholder class="typeselect"
+              @change="selectgoodsName">
+              <ws-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue"
+                :value="item.constValue" />
             </ws-select>
           </ws-form-item>
           <ws-form-item label="类型" span="1" prop="type">
-              <ws-select v-model="deptBudgetList.type"  @change="typeChange">
-                <ws-option v-for="item in typeList" :key="item" :label="item" :value="item" />
-              </ws-select>
-            </ws-form-item>
+            <ws-select v-model="deptBudgetList.type" @change="typeChange">
+              <ws-option v-for="item in typeList" :key="item" :label="item" :value="item" />
+            </ws-select>
+          </ws-form-item>
           <!--毛重(公斤)-->
           <ws-form-item label="毛重(公斤)" span="1" prop="grossWeight">
-            <ws-input
-              :disabled="allowEdit"
-              @input="grossWeightchange"
-              v-model="deptBudgetList.grossWeight"
-              type="number" @mousewheel.native.prevent
-              placeholder="请输入毛重"
-              maxlength="20"
-              size="small"
-            />
-              <el-button type="primary" v-if="information == '毛重检斤'" @click="openPort">重新获取</el-button>
+            <ws-input :disabled="allowEdit" @input="grossWeightchange" v-model="deptBudgetList.grossWeight"
+              type="number" @mousewheel.native.prevent placeholder="请输入毛重" maxlength="20" size="small" />
+            <el-button type="primary" v-if="information == '毛重检斤'" @click="openPort">重新获取</el-button>
           </ws-form-item>
 
           <!--皮重(公斤)-->
           <ws-form-item label="皮重(公斤)" span="1" prop="tare" class="readonly">
-            <ws-input
-              :disabled="allowEdit"
-              @input="tarechange"
-              v-model="deptBudgetList.tare"
-              type="number" @mousewheel.native.prevent
-              placeholder="请输入皮重"
-              maxlength="100"
-              size="small"
-            />
-              <el-button type="primary" v-if="information == '皮重检斤'" @click="openPort">重新获取</el-button>
+            <ws-input :disabled="allowEdit" @input="tarechange" v-model="deptBudgetList.tare" type="number"
+              @mousewheel.native.prevent placeholder="请输入皮重" maxlength="100" size="small" />
+            <el-button type="primary" v-if="information == '皮重检斤'" @click="openPort">重新获取</el-button>
           </ws-form-item>
           <!--净重(公斤)-->
           <ws-form-item label="净重(公斤)" span="1" prop="netWeight">
-            <ws-input
-              disabled
-              v-model="deptBudgetList.netWeight"
-              placeholder="不可编辑,自动计算"
-              maxlength="120"
-              size="small"
-            />
+            <ws-input disabled v-model="deptBudgetList.netWeight" placeholder="不可编辑,自动计算" maxlength="120"
+              size="small" />
           </ws-form-item>
           <ws-form-item v-if='deptBudgetList.type=="潮粮"' label="扣重比" span="1" prop="buckleWeightRatio" class="readonly">
-            <ws-input
-              @input='pureweight'
-              v-model="deptBudgetList.buckleWeightRatio"
-              type="number" @mousewheel.native.prevent
-              placeholder="请输入扣重比"
-              maxlength="100"
-              size="small"
-            />
+            <ws-input @input='pureweight' v-model="deptBudgetList.buckleWeightRatio" type="number"
+              @mousewheel.native.prevent placeholder="请输入扣重比" maxlength="100" size="small" />
           </ws-form-item>
-          <ws-form-item v-if='deptBudgetList.type=="潮粮"' label="干粮水分占比" span="1" prop="solidGrainWater" class="readonly">
-            <ws-input
-            @input='pureweight'
-              v-model="deptBudgetList.solidGrainWater"
-              type="number" @mousewheel.native.prevent
-              placeholder="请输入干粮水分占比"
-              maxlength="100"
-              size="small"
-            />
+          <ws-form-item v-if='deptBudgetList.type=="潮粮"' label="干粮水分占比" span="1" prop="solidGrainWater"
+            class="readonly">
+            <ws-input @input='pureweight' v-model="deptBudgetList.solidGrainWater" type="number"
+              @mousewheel.native.prevent placeholder="请输入干粮水分占比" maxlength="100" size="small" />
           </ws-form-item>
-          <ws-form-item v-if='deptBudgetList.type=="潮粮"' label="潮粮水分占比" span="1" prop="tidalGrainWater" class="readonly">
-            <ws-input
-            @input='pureweight'
-              v-model="deptBudgetList.tidalGrainWater"
-              type="number" @mousewheel.native.prevent
-              placeholder="请输入潮粮水分占比"
-              maxlength="100"
-              size="small"
-            />
+          <ws-form-item v-if='deptBudgetList.type=="潮粮"' label="潮粮水分占比" span="1" prop="tidalGrainWater"
+            class="readonly">
+            <ws-input @input='pureweight' v-model="deptBudgetList.tidalGrainWater" type="number"
+              @mousewheel.native.prevent placeholder="请输入潮粮水分占比" maxlength="100" size="small" />
           </ws-form-item>
           <ws-form-item v-if='deptBudgetList.type=="潮粮"' label="纯重" span="1" prop="pureWeight" class="readonly">
-            <ws-input
-              disabled
-              v-model="deptBudgetList.pureWeight"
-              type="number" @mousewheel.native.prevent
-              placeholder="不可编辑,自动计算"
-              maxlength="100"
-              size="small"
-            />
+            <ws-input disabled v-model="deptBudgetList.pureWeight" type="number" @mousewheel.native.prevent
+              placeholder="不可编辑,自动计算" maxlength="100" size="small" />
           </ws-form-item>
           <!-- 品级 -->
           <ws-form-item label="品级" span="1" class="readonly">
-            <ws-select
-              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 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-form-item>
           <!--经办人-->
           <ws-form-item label="经办人" span="1" prop="agent">
-           <el-select
-              v-model="deptBudgetList.agent"
-              placeholder="请选择经办人"
-              filterable
-              clearable
-              @change="selectstaff"
-            >
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.staffName"
-                :value="item.staffName"
-              />
+            <el-select v-model="deptBudgetList.agent" placeholder="请选择经办人" filterable clearable @change="selectstaff">
+              <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
             </el-select>
           </ws-form-item>
           <!--出库日期-->
-          <ws-form-item
-            label="出库日期"
-            span="1"
-            prop="inOutDate"
-            class="deliverydate"
-          >
-            <ws-date-picker
-              v-model="deptBudgetList.inOutDate"
-              type="date"
-              placeholder="请选择出库日期"
-              value-format="yyyy-MM-dd"
-            />
+          <ws-form-item label="出库日期" span="1" prop="inOutDate" class="deliverydate">
+            <ws-date-picker v-model="deptBudgetList.inOutDate" type="date" placeholder="请选择出库日期"
+              value-format="yyyy-MM-dd" />
           </ws-form-item>
           <!-- 出库类型 -->
           <ws-form-item label="出库类型" span="1">
-            <ws-input v-model='deptBudgetList.inOutType' class="right-bottom" :disabled="isSelectType" placeholder='暂无' />
+            <ws-input v-model='deptBudgetList.inOutType' class="right-bottom" :disabled="isSelectType"
+              placeholder='暂无' />
             <!-- <ws-select
               v-model="deptBudgetList.deliveryType"
               placeholder=""
@@ -232,30 +123,13 @@
             </ws-select> -->
           </ws-form-item>
           <!--车牌号-->
-         <ws-form-item label="车牌号" span="1" prop="carNo">
-            <ws-input
-              v-if="!carstatus"
-              v-model="deptBudgetList.carNo"
-              placeholder="请输入车牌号"
-              maxlength="7"
-              size="small"
-            />
-            <el-select
-              v-if="carstatus"
-              filterable
-              clearable
-              :filter-method="dataFilter2"
-              v-model="deptBudgetList.carNo"
-              placeholder="请选择车牌号"
-              class="typeselect"
-              @change="carChange"
-            >
-              <el-option
-                v-for="item in options2"
-                :key="item.constKey"
-                :label="item.carNo + '(' + item.tranCarNo + ')'"
-                :value="item.carNo"
-              />
+          <ws-form-item label="车牌号" span="1" prop="carNo">
+            <ws-input v-if="!carstatus" v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7"
+              size="small" />
+            <el-select v-if="carstatus" filterable clearable :filter-method="dataFilter2" v-model="deptBudgetList.carNo"
+              placeholder="请选择车牌号" class="typeselect" @change="carChange">
+              <el-option v-for="item in options2" :key="item.constKey" :label="item.carNo + '(' + item.tranCarNo + ')'"
+                :value="item.carNo" />
             </el-select>
           </ws-form-item>
         </ws-info-table>
@@ -287,374 +161,329 @@
             size="small"
           />
         </ws-form-item> -->
-             <ws-form-item label="质检员" span="1" prop="qualityInspector">
-            <el-select
-              v-model="deptBudgetList.warehouseInOutDetail.qualityInspector"
-              placeholder="请选择质检员"
-              filterable
-              clearable
-              @change="qualityInspectorChange"
-            >
-              <el-option
-                v-for="item in qualityInspectorList"
-                :key="item.value"
-                :label="item.staffName"
-                :value="item.staffName"
-              />
-            </el-select>
-          </ws-form-item>
+        <ws-form-item label="质检员" span="1" prop="qualityInspector">
+          <el-select v-model="deptBudgetList.warehouseInOutDetail.qualityInspector" placeholder="请选择质检员" filterable
+            clearable @change="qualityInspectorChange">
+            <el-option v-for="item in qualityInspectorList" :key="item.value" :label="item.staffName"
+              :value="item.staffName" />
+          </el-select>
+        </ws-form-item>
       </div>
       <div class="neifor">
         <ws-info-table>
           <!--水分(%)<=-->
           <ws-form-item label="水分(%)" span="1" prop="waterContent">
-            <ws-input
-              v-model="deptBudgetList.warehouseInOutDetail.waterContent"
-              placeholder="请输入水分占比"
-              maxlength="120"
-              type="number" @mousewheel.native.prevent
-              size="small"
-            />
+            <ws-input v-model="deptBudgetList.warehouseInOutDetail.waterContent" placeholder="请输入水分占比" maxlength="120"
+              type="number" @mousewheel.native.prevent size="small" />
           </ws-form-item>
           <!--杂质(%)<=-->
           <ws-form-item label="杂质(%)" span="1" prop="impurity">
-            <ws-input
-              v-model="deptBudgetList.warehouseInOutDetail.impurity"
-              placeholder="请输入杂质占比"
-              type="number" @mousewheel.native.prevent
-              maxlength="120"
-              size="small"
-            />
+            <ws-input v-model="deptBudgetList.warehouseInOutDetail.impurity" placeholder="请输入杂质占比" type="number"
+              @mousewheel.native.prevent maxlength="120" size="small" />
           </ws-form-item>
           <!--容重(克/升)>=-->
           <ws-form-item label="容重(克/升)" span="1" prop="bulkDensity">
-            <ws-input
-              v-model="deptBudgetList.warehouseInOutDetail.bulkDensity"
-              placeholder="请输入容重"
-              type="number" @mousewheel.native.prevent
-              maxlength="120"
-              size="small"
-            />
+            <ws-input v-model="deptBudgetList.warehouseInOutDetail.bulkDensity" placeholder="请输入容重" type="number"
+              @mousewheel.native.prevent maxlength="120" size="small" />
           </ws-form-item>
           <!--霉变粒(%)<=-->
           <ws-form-item label="霉变粒(%)" span="1" prop="mildewGrain">
-            <ws-input
-              v-model="deptBudgetList.warehouseInOutDetail.mildewGrain"
-              placeholder="请输入霉变粒占比"
-              maxlength="120"
-              type="number" @mousewheel.native.prevent
-              size="small"
-            />
+            <ws-input v-model="deptBudgetList.warehouseInOutDetail.mildewGrain" placeholder="请输入霉变粒占比" maxlength="120"
+              type="number" @mousewheel.native.prevent size="small" />
           </ws-form-item>
           <!--热损伤(%)<=-->
           <ws-form-item label="热损伤(%)" span="1" prop="jiaorenli">
-            <ws-input
-              v-model="deptBudgetList.warehouseInOutDetail.jiaorenli"
-              placeholder="请输入热损伤占比"
-              type="number" @mousewheel.native.prevent
-              maxlength="120"
-              size="small"
-            />
+            <ws-input v-model="deptBudgetList.warehouseInOutDetail.jiaorenli" placeholder="请输入热损伤占比" type="number"
+              @mousewheel.native.prevent maxlength="120" size="small" />
           </ws-form-item>
           <!--不完善粒(%)<=-->
           <ws-form-item label="不完善粒(%)" span="1" prop="imperfectGrain">
-            <ws-input
-              v-model="deptBudgetList.warehouseInOutDetail.imperfectGrain"
-              placeholder="请输入不完善粒占比"
-              type="number" @mousewheel.native.prevent
-              maxlength="120"
-              size="small"
-            />
+            <ws-input v-model="deptBudgetList.warehouseInOutDetail.imperfectGrain" placeholder="请输入不完善粒占比" type="number"
+              @mousewheel.native.prevent maxlength="120" size="small" />
           </ws-form-item>
         </ws-info-table>
       </div>
       <div style="text-align: right; padding: 10px">
-        <el-button v-if="information == '皮重检斤'" class="bg-bottom-up" size="small" @click="temporaryStorage()"
-          >保存</el-button
-        >
-        <el-button
-          v-if="!allowEdit"
-          class="bg-bottom-up"
-          type="primary"
-          size="small"
-          @click="submit()"
-          >提交</el-button
-        >
+        <el-button v-if="information == '皮重检斤'" class="bg-bottom-up" size="small" @click="temporaryStorage()">保存
+        </el-button>
+        <el-button v-if="!allowEdit" class="bg-bottom-up" type="primary" size="small" @click="submit()">提交</el-button>
       </div>
     </ws-form>
   </div>
 </template>
 <script>
-import {
-  pullDown,
-  addstorageputList,
-  goodsname,
-  xialaNo,
-  getstaff,
-  goodsnameXiala,
-  getReceiptTaskNo
-} from '@/model/warehouse/index'
-import Pagination from '@/components/Pagination'
-import WsUpload from '@/components/WsUpload'
-// import { dayjs, fmoney, EventBus } from 'base-core-lib'
-import { dayjs, EventBus } from 'base-core-lib'
-export default {
-  name: 'viewSpareMoney',
-  components: {
-    WsUpload,
-    Pagination,
-  },
-  watch: {
-    isShow(val) {
-      this.showType = val
+  import {
+    pullDown,
+    addstorageputList,
+    goodsname,
+    xialaNo,
+    getstaff,
+    goodsnameXiala,
+    getReceiptTaskNo
+  } from '@/model/warehouse/index'
+  import Pagination from '@/components/Pagination'
+  import WsUpload from '@/components/WsUpload'
+  // import { dayjs, fmoney, EventBus } from 'base-core-lib'
+  import {
+    dayjs,
+    EventBus
+  } from 'base-core-lib'
+  export default {
+    name: 'viewSpareMoney',
+    components: {
+      WsUpload,
+      Pagination,
+    },
+    watch: {
+      isShow(val) {
+        this.showType = val
+      },
     },
-  },
-  data() {
-    return {
-      deptBudgetList1:[],
-      isSelectType:true,
-       carstatus: false,
-       qualityInspectorList:[],
-      //弹出框
-      dialogViewSpareMoney: false,
-      dialogApproveFormVisible: false,
-      // 船舶类型
-      monetaryKey: null,
-      // 表格显示数据
-      tableDate: [],
-      // 是否显示
-      showType: true,
-      readonly: true,
-      // 年
-      year: '',
-      deptBudgetTotal: 0,
-      currentPage: 1,
-      pageSize: 10,
-      searchType: 1,
-      searchKeyWord: '',
-      contractType: 2,
-      startDate: null,
-      endDate: null,
-      goodnameList: {},
-      // 提交类型
-      submitType: true,
-      deliveryType: [],
-      typeList:['干粮','潮粮'],
-      outContractNo: [],
-      appendixIdsAdd: '',
-      uploadSuccess: {},
-      gradeList: [],
-      agent: [],
-       staffList: [],
-      options: [],
-      value:'',
-      rules: {
-        netWeight: [
-          {
+    data() {
+      return {
+        deptBudgetList1: [],
+        isSelectType: true,
+        carstatus: false,
+        qualityInspectorList: [],
+        //弹出框
+        dialogViewSpareMoney: false,
+        dialogApproveFormVisible: false,
+        // 船舶类型
+        monetaryKey: null,
+        // 表格显示数据
+        tableDate: [],
+        // 是否显示
+        showType: true,
+        readonly: true,
+        // 年
+        year: '',
+        deptBudgetTotal: 0,
+        currentPage: 1,
+        pageSize: 10,
+        searchType: 1,
+        searchKeyWord: '',
+        contractType: 2,
+        startDate: null,
+        endDate: null,
+        goodnameList: {},
+        // 提交类型
+        submitType: true,
+        deliveryType: [],
+        typeList: ['干粮', '潮粮'],
+        outContractNo: [],
+        appendixIdsAdd: '',
+        uploadSuccess: {},
+        gradeList: [],
+        agent: [],
+        staffList: [],
+        options: [],
+        value: '',
+        rules: {
+          netWeight: [{
             required: true,
             type: 'number',
             message: '请输入活动名称',
             trigger: 'blur',
-          },
-        ],
-      },
-      size: 10,
-      compId: sessionStorage.getItem('ws-pf_compId'),
-      skinInspector: sessionStorage.getItem('ws-pf_staffName'),
-      deptCircularPage: {},
-      packtypeList: {},
-      date: {
-        year: dayjs().format('YYYY'),
-        month: dayjs().format('MM'),
-      },
-      contractList: [],
-      deptBudgetList: {
-        type:'干粮',
-        addressUrl:'',
-        warehouseInOutDetail: {},
-        grossWeight:0,
-        tare:0
-      },
-      historyList: [],
+          }, ],
+        },
+        size: 10,
+        compId: sessionStorage.getItem('ws-pf_compId'),
+        skinInspector: sessionStorage.getItem('ws-pf_staffName'),
+        deptCircularPage: {},
+        packtypeList: {},
+        date: {
+          year: dayjs().format('YYYY'),
+          month: dayjs().format('MM'),
+        },
+        contractList: [],
+        deptBudgetList: {
+          type: '干粮',
+          addressUrl: '',
+          warehouseInOutDetail: {},
+          grossWeight: 0,
+          tare: 0
+        },
+        historyList: [],
 
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          return time.getTime() > Date.now()
+        pickerBeginDateBefore: {
+          disabledDate: (time) => {
+            return time.getTime() > Date.now()
+          },
         },
-      },
-      accessoryTFs: false,
-      allowEdit: true,
-      param: 9600,
-      information:'',
-      result1:'00'
-    }
-  },
-  mounted() {
-    this.information = this.$route.query.information
-    if(this.$route.query.allowEdit == 1){
-      this.allowEdit = false
-    }
-    else{
-      this.allowEdit = true
-    }
-    this.deptBudgetList.baseId = this.$route.query.baseId
-    this.deptBudgetList.positionId = this.$route.query.positionId
-    this.deptBudgetList.warehouseName = this.$route.query.warehouseName
-    this.deptBudgetList.binNumber = this.$route.query.binNumber
-    this.deptBudgetList.warehouseType = this.$route.query.warehouseType
-    this.deptBudgetList.warehouseId = this.$route.query.warehouseId
-    this.getList()
-       getReceiptTaskNo().toPromise()
-            .then((response) => {
-                console.log(response)
-                this.deptBudgetList1 = response
-            })
-  },
-  methods: {
-    async closePort() {
-      console.log('closePort');
-      this.reader.cancel()
+        accessoryTFs: false,
+        allowEdit: true,
+        param: 9600,
+        information: '',
+        result1: '00'
+      }
     },
-    async openPort() {
-      console.log('openPort', navigator);
-      if ('serial' in navigator) {
-        // The Web Serial API is supported.
-        console.log('the Web Serial API is supported.');
-        console.log(this.param);
-        const port = await navigator.serial.requestPort();
-        await port.open({
-          baudRate: this.param
-        }); // set baud rate
-        this.reader = port.readable.getReader();
-        // 监听来自串行设备的数据
-        while (true) {
-          const {
-            value,
-            done
-          } = await this.reader.read();
-          // console.log("value",value);
-          if (done) {
-            // 允许稍后关闭串口。
-            this.reader.releaseLock();
-            break;
-          }
-          var result = '';
-          //2。获取16进制字符串
-          // var receData = HexConvert.ByteToString(value);
-          // console.log("receData",receData);
-          var flag = false;
-          var flag1 = false;
-          // for (var i = 0; i < value.length; i++) {
-          //   var tmp = String.fromCharCode(value[i])
-          //   if (tmp == '+') {
-          //     flag = true
-          //   }
-          //   if (flag && result.length < 6 && tmp != '+') {
-          //     result += tmp
-          //   }
-          // }
-          // if (this.information != '毛重检斤') {
-          //   if(parseInt(result)){
-          //     this.deptBudgetList.grossWeight = parseInt(result)
-          //   }
-          // } else {
-          //   if(parseInt(result)){
-          //     this.deptBudgetList.tare = parseInt(result)
-          //   }
-          // }
-          if(this.deptBudgetList.warehouseName&&(this.deptBudgetList.warehouseName == '山东诸城迈饶库'||this.deptBudgetList.warehouseName == '克东千红库'||this.warehouseName == '鲅鱼圈祥腾库')){
-            for (var i = 0; i < value.length; i++) {
-              var tmp = String.fromCharCode(value[i])
-              if (tmp == '+') {
-              flag = true
-              }
-              if (flag && result.length < 6 && tmp != '+') {
-              result += tmp
-              }
-            }
-            if (this.information == '毛重检斤') {
-              if(parseInt(result)|| parseInt(result) == 0){
-                this.deptBudgetList.grossWeight = parseInt(result)
-              }
-            } else {
-              if(parseInt(result)|| parseInt(result) == 0){
-                this.deptBudgetList.tare = parseInt(result)
-              }
+    mounted() {
+      this.information = this.$route.query.information
+      if (this.$route.query.allowEdit == 1) {
+        this.allowEdit = false
+      } else {
+        this.allowEdit = true
+      }
+      this.deptBudgetList.baseId = this.$route.query.baseId
+      this.deptBudgetList.positionId = this.$route.query.positionId
+      this.deptBudgetList.warehouseName = this.$route.query.warehouseName
+      this.deptBudgetList.binNumber = this.$route.query.binNumber
+      this.deptBudgetList.warehouseType = this.$route.query.warehouseType
+      this.deptBudgetList.warehouseId = this.$route.query.warehouseId
+      this.getList()
+      getReceiptTaskNo().toPromise()
+        .then((response) => {
+          console.log(response)
+          this.deptBudgetList1 = response
+        })
+    },
+    methods: {
+      async closePort() {
+        console.log('closePort');
+        this.reader.cancel()
+      },
+      async openPort() {
+        console.log('openPort', navigator);
+        if ('serial' in navigator) {
+          // The Web Serial API is supported.
+          console.log('the Web Serial API is supported.');
+          console.log(this.param);
+          const port = await navigator.serial.requestPort();
+          await port.open({
+            baudRate: this.param
+          }); // set baud rate
+          this.reader = port.readable.getReader();
+          // 监听来自串行设备的数据
+          while (true) {
+            const {
+              value,
+              done
+            } = await this.reader.read();
+            // console.log("value",value);
+            if (done) {
+              // 允许稍后关闭串口。
+              this.reader.releaseLock();
+              break;
             }
-          }
-          else{
-            for(var i=0;i<value.length;i++){
-              var tmp = String.fromCharCode(value[i])
-              
-              if((value[0] != 49 && value[0] != 2)){
-                if((value[value.length-1] == 48&&value[value.length-2] == 48)){
-                  flag1 = true
+            var result = '';
+            //2。获取16进制字符串
+            // var receData = HexConvert.ByteToString(value);
+            // console.log("receData",receData);
+            var flag = false;
+            var flag1 = false;
+            // for (var i = 0; i < value.length; i++) {
+            //   var tmp = String.fromCharCode(value[i])
+            //   if (tmp == '+') {
+            //     flag = true
+            //   }
+            //   if (flag && result.length < 6 && tmp != '+') {
+            //     result += tmp
+            //   }
+            // }
+            // if (this.information != '毛重检斤') {
+            //   if(parseInt(result)){
+            //     this.deptBudgetList.grossWeight = parseInt(result)
+            //   }
+            // } else {
+            //   if(parseInt(result)){
+            //     this.deptBudgetList.tare = parseInt(result)
+            //   }
+            // }
+            if (this.deptBudgetList.warehouseName && (this.deptBudgetList.warehouseName == '山东诸城迈饶库' || this
+                .deptBudgetList.warehouseName == '克东千红库' || this.warehouseName == '鲅鱼圈祥腾库')) {
+              for (var i = 0; i < value.length; i++) {
+                var tmp = String.fromCharCode(value[i])
+                if (tmp == '+') {
+                  flag = true
                 }
-                else{
-                  break
+                if (flag && result.length < 6 && tmp != '+') {
+                  result += tmp
                 }
               }
-              if (tmp == String.fromCharCode(32) ) {
-                flag = true
-              }
-              if (flag && result.length < 7 && tmp != String.fromCharCode(32)&&!(value[value.length-1] == 48&&value[value.length-2] == 48)) {
-                result += tmp
+              if (this.information == '毛重检斤') {
+                if (parseInt(result) || parseInt(result) == 0) {
+                  this.deptBudgetList.grossWeight = parseInt(result)
+                }
+              } else {
+                if (parseInt(result) || parseInt(result) == 0) {
+                  this.deptBudgetList.tare = parseInt(result)
+                }
               }
-              if (flag1 && tmp != String.fromCharCode(32)) {
-                if((value[value.length-1] == 48&&value[value.length-2] == 48)){
-                  if(i == 0 ){
-                    this.result1 = tmp + '0'
+            } else {
+              for (var i = 0; i < value.length; i++) {
+                var tmp = String.fromCharCode(value[i])
+
+                if ((value[0] != 49 && value[0] != 2)) {
+                  if ((value[value.length - 1] == 48 && value[value.length - 2] == 48)) {
+                    flag1 = true
+                  } else {
+                    break
+                  }
+                }
+                if (tmp == String.fromCharCode(32)) {
+                  flag = true
+                }
+                if (flag && result.length < 7 && tmp != String.fromCharCode(32) && !(value[value.length - 1] == 48 &&
+                    value[value.length - 2] == 48)) {
+                  result += tmp
+                }
+                if (flag1 && tmp != String.fromCharCode(32)) {
+                  if ((value[value.length - 1] == 48 && value[value.length - 2] == 48)) {
+                    if (i == 0) {
+                      this.result1 = tmp + '0'
+                    }
                   }
                 }
               }
-            }
-            if (this.information == '毛重检斤') {
-              if(parseInt(result)|| parseInt(result) == 0){
-              this.deptBudgetList.grossWeight = parseInt(result+this.result1)
-              }
-            } else {
-              if(parseInt(result)|| parseInt(result) == 0){
-              this.deptBudgetList.tare = parseInt(result+this.result1)
+              if (this.information == '毛重检斤') {
+                if (parseInt(result) || parseInt(result) == 0) {
+                  this.deptBudgetList.grossWeight = parseInt(result + this.result1)
+                }
+              } else {
+                if (parseInt(result) || parseInt(result) == 0) {
+                  this.deptBudgetList.tare = parseInt(result + this.result1)
+                }
               }
             }
+            setTimeout(1000)
+            // value 是一个 Uint8Array
           }
-          setTimeout(1000)
-          // value 是一个 Uint8Array
+          await port.close();
+        } else {
+          console.log('the Web Serial API is not supported.', navigator);
         }
-        await port.close();
-      } else {
-        console.log('the Web Serial API is not supported.', navigator);
-      }
-    },
-    qualityInspectorChange(e){
-      console.log(e)
-    },
-    uploadSuccessHandle1(res){
-      this.deptBudgetList.addressUrl=res.url
-    },
-    //返回按钮
-    revert() {
-      this.$router.push({ path: 'warehouseManagementList' })
-    },
-        carChange(e) {
-      for (let i = 0; i < this.tranCarInfoList.length; i++) {
-        if (this.tranCarInfoList[i].carNo == this.deptBudgetList.carNo) {
-          this.deptBudgetList.tranCarNo=this.tranCarInfoList[i].tranCarNo
+      },
+      qualityInspectorChange(e) {
+        console.log(e)
+      },
+      uploadSuccessHandle1(res) {
+        this.deptBudgetList.addressUrl = res.url
+      },
+      //返回按钮
+      revert() {
+        this.$router.push({
+          path: 'warehouseManagementList'
+        })
+      },
+      carChange(e) {
+        for (let i = 0; i < this.tranCarInfoList.length; i++) {
+          if (this.tranCarInfoList[i].carNo == this.deptBudgetList.carNo) {
+            this.deptBudgetList.tranCarNo = this.tranCarInfoList[i].tranCarNo
+          }
         }
-      }
-    },
-    typeChange(e){
+      },
+      typeChange(e) {
 
-    },
-    contractNoChange(e){
-      for(let i = 0 ; i < this.deptBudgetList1.length ; i ++){
-        if(this.deptBudgetList1[i].inOutTaskNo == e){
-          this.deptBudgetList.contractNo = this.deptBudgetList1[i].contractNo
+      },
+      contractNoChange(e) {
+        for (let i = 0; i < this.deptBudgetList1.length; i++) {
+          if (this.deptBudgetList1[i].inOutTaskNo == e) {
+            this.deptBudgetList.contractNo = this.deptBudgetList1[i].contractNo
+          }
         }
-      }
-      for (var i = 0; i < this.outContractNo.length; i++) {
-        if (this.outContractNo[i].contractNo == this.deptBudgetList.contractNo) {
-             if (this.outContractNo[i].inOutType == '销售出库') {
+        for (var i = 0; i < this.outContractNo.length; i++) {
+          if (this.outContractNo[i].contractNo == this.deptBudgetList.contractNo) {
+            if (this.outContractNo[i].inOutType == '销售出库') {
               this.deptBudgetList.inOutTypeKey = 1
             } else if (this.outContractNo[i].inOutType == '移库出库') {
               this.deptBudgetList.inOutTypeKey = 3
@@ -665,21 +494,26 @@ export default {
             } else if (this.outContractNo[i].inOutType == '采购出库') {
               this.deptBudgetList.inOutTypeKey = 6
             }
-          this.deptBudgetList.goodsName = this.outContractNo[i].goodsName
-          this.deptBudgetList.goodsNameKey = this.outContractNo[i].goodsNameKey
-          this.deptBudgetList.inOutType = this.outContractNo[i].inOutType
-          if(this.outContractNo[i].tranCarInfoList){
-            this.options2=this.outContractNo[i].tranCarInfoList
-            this.tranCarInfoList=this.outContractNo[i].tranCarInfoList
-            this.carstatus=true
+            this.deptBudgetList.goodsName = this.outContractNo[i].goodsName
+            this.deptBudgetList.goodsNameKey = this.outContractNo[i].goodsNameKey
+            this.deptBudgetList.inOutType = this.outContractNo[i].inOutType
+            if (this.outContractNo[i].deliverType == '1') {
+              this.carstatus = true
+            } else {
+              this.carstatus = false
+            }
+            if (this.outContractNo[i].tranCarInfoList) {
+              this.options2 = this.outContractNo[i].tranCarInfoList
+              this.tranCarInfoList = this.outContractNo[i].tranCarInfoList
+              this.carstatus = true
+            }
           }
         }
-      }
-    },
-    contractNoChange1(e){
-      for (var i = 0; i < this.outContractNo.length; i++) {
-        if (this.outContractNo[i].contractNo == e) {
-             if (this.outContractNo[i].inOutType == '销售出库') {
+      },
+      contractNoChange1(e) {
+        for (var i = 0; i < this.outContractNo.length; i++) {
+          if (this.outContractNo[i].contractNo == e) {
+            if (this.outContractNo[i].inOutType == '销售出库') {
               this.deptBudgetList.inOutTypeKey = 1
             } else if (this.outContractNo[i].inOutType == '移库出库') {
               this.deptBudgetList.inOutTypeKey = 3
@@ -690,1069 +524,1122 @@ export default {
             } else if (this.outContractNo[i].inOutType == '采购出库') {
               this.deptBudgetList.inOutTypeKey = 6
             }
-          this.deptBudgetList.goodsName = this.outContractNo[i].goodsName
-          this.deptBudgetList.goodsNameKey = this.outContractNo[i].goodsNameKey
-          this.deptBudgetList.inOutType = this.outContractNo[i].inOutType
-          if(this.outContractNo[i].tranCarInfoList){
-            this.options2=this.outContractNo[i].tranCarInfoList
-            this.tranCarInfoList=this.outContractNo[i].tranCarInfoList
-            this.carstatus=true
+            this.deptBudgetList.goodsName = this.outContractNo[i].goodsName
+            this.deptBudgetList.goodsNameKey = this.outContractNo[i].goodsNameKey
+            this.deptBudgetList.inOutType = this.outContractNo[i].inOutType
+            if (this.outContractNo[i].tranCarInfoList) {
+              this.options2 = this.outContractNo[i].tranCarInfoList
+              this.tranCarInfoList = this.outContractNo[i].tranCarInfoList
+              this.carstatus = true
+            }
           }
         }
-      }
-    },
-    dataFilter2(val) {
-      this.deptBudgetList.carNo = val
-      if (val) {
-        //val存在
-        this.options1 = this.outContractNo1.filter((item) => {
-          if (
-            !!~item.carNo.indexOf(val) ||
-            !!~item.carNo.toUpperCase().indexOf(val.toUpperCase())
-          ) {
-            return true
-          }
-        })
-      } else {
-        //val为空时,还原数组
-        this.options2 = this.tranCarInfoList
-      }
-    },
-    dataFilter(val) {
-      // console.log(val,"名")
-      this.deptBudgetList.staffList = val
-      if (val) {
-        //val存在
-        this.options = this.staffList.filter((item) => {
-          if (
-            !!~item.staffName.indexOf(val) ||
-            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
-          ) {
-            return true
+      },
+      dataFilter2(val) {
+        this.deptBudgetList.carNo = val
+        if (val) {
+          //val存在
+          this.options1 = this.outContractNo1.filter((item) => {
+            if (
+              !!~item.carNo.indexOf(val) ||
+              !!~item.carNo.toUpperCase().indexOf(val.toUpperCase())
+            ) {
+              return true
+            }
+          })
+        } else {
+          //val为空时,还原数组
+          this.options2 = this.tranCarInfoList
+        }
+      },
+      dataFilter(val) {
+        // console.log(val,"名")
+        this.deptBudgetList.staffList = val
+        if (val) {
+          //val存在
+          this.options = this.staffList.filter((item) => {
+            if (
+              !!~item.staffName.indexOf(val) ||
+              !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
+            ) {
+              return true
+            }
+          })
+        } else {
+          //val为空时,还原数组
+          this.options = this.staffList
+        }
+      },
+      selectstaff(e) {
+        for (var i = 0; i < this.staffList.length; i++) {
+          if (this.staffList[i].staffName == e) {
+            this.deptBudgetList.personChargeKey = this.staffList[i].staffId
           }
-        })
-      } else {
-        //val为空时,还原数组
-        this.options = this.staffList
-      }
-    },
-    selectstaff(e) {
-      for (var i = 0; i < this.staffList.length; i++) {
-        if (this.staffList[i].staffName == e) {
-          this.deptBudgetList.personChargeKey = this.staffList[i].staffId
         }
-      }
-    },
-    pureweight(e){
-      console.log(this.deptBudgetList)
-      if(this.deptBudgetList.netWeight&&this.deptBudgetList.tidalGrainWater&&this.deptBudgetList.solidGrainWater&&this.deptBudgetList.buckleWeightRatio){
-        this.deptBudgetList.pureWeight=(this.deptBudgetList.netWeight*(100-(this.deptBudgetList.tidalGrainWater-this.deptBudgetList.solidGrainWater)*this.deptBudgetList.buckleWeightRatio))/100
-      }
-    },
-    temporaryStorage() {
-      if (!this.deptBudgetList.goodsName) {
-        this.$message({
-          message: '货名不能为空',
-          type: 'warning',
-        })
-        return
-      }
-      if (this.information == '毛重检斤'&&!this.deptBudgetList.grossWeight) {
-        this.$message({
-          message: '毛重不能为空',
-          type: 'warning',
-        })
-        return
-      }
-      if (this.information == '毛重检斤'&&(
-        this.deptBudgetList.grossWeight <= 0 ||
-        this.deptBudgetList.grossWeight > 200000 ||
-        (String(this.deptBudgetList.grossWeight).indexOf('.') != -1 &&
-          String(this.deptBudgetList.grossWeight).length -
-            (String(this.deptBudgetList.grossWeight).indexOf('.') + 1) >
-            3))
-      ) {
-        this.$message({
-          message: '毛重输入错误',
-          type: 'warning',
-        })
-        return
-      }
-      if (this.information == '皮重检斤'&&!this.deptBudgetList.tare) {
-        this.$message({
-          message: '皮重不能为空',
-          type: 'warning',
-        })
-        return
-      }
-      if (this.information == '皮重检斤'&&(
-        this.deptBudgetList.tare < 0 ||
-        this.deptBudgetList.tare > 200000 ||
-        (String(this.deptBudgetList.tare).indexOf('.') != -1 &&
-          String(this.deptBudgetList.tare).length -
-            (String(this.deptBudgetList.tare).indexOf('.') + 1) >
-            3))
-      ) {
-        this.$message({
-          message: '皮重输入错误',
-          type: 'warning',
-        })
-        return
-      }
-      
-      if (!this.deptBudgetList.carNo) {
-        this.$message({
-          message: '车牌号不能为空',
-          type: 'warning',
-        })
-        return
-      }
-      if (this.deptBudgetList.carNo.length > 7) {
-        this.$message({
-          message: '车牌号输入错误,请输入7个字符之内',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.deptBudgetList.contractNo) {
-        this.$message({
-          message: '合同编号不能为空',
-          type: 'warning',
-        })
-        return
-      }
-      // if (
-      //   this.deptBudgetList.contractNo.length < 6 ||
-      //   this.deptBudgetList.contractNo.length > 20
-      // ) {
-      //   this.$message({
-      //     message: '合同编号长度不符合要求,请输入6-20个字符之内',
-      //     type: 'warning',
-      //   })
-      //   return
-      // }
-      //自检员
-      if (this.deptBudgetList.warehouseInOutDetail.qualityInspector) {
-        if (
-          this.deptBudgetList.warehouseInOutDetail.qualityInspector.length <
-            2 ||
-          this.deptBudgetList.warehouseInOutDetail.qualityInspector.length > 10
-        ) {
+      },
+      pureweight(e) {
+        console.log(this.deptBudgetList)
+        if (this.deptBudgetList.netWeight && this.deptBudgetList.tidalGrainWater && this.deptBudgetList
+          .solidGrainWater && this.deptBudgetList.buckleWeightRatio) {
+          this.deptBudgetList.pureWeight = (this.deptBudgetList.netWeight * (100 - (this.deptBudgetList
+            .tidalGrainWater - this.deptBudgetList.solidGrainWater) * this.deptBudgetList.buckleWeightRatio)) / 100
+        }
+      },
+      temporaryStorage() {
+        if (!this.deptBudgetList.goodsName) {
           this.$message({
-            message: '质检员姓名长度错误!',
+            message: '货名不能为空',
             type: 'warning',
           })
           return
         }
-      }
-      if (this.deptBudgetList.warehouseInOutDetail.waterContent) {
-        if (isNaN(this.deptBudgetList.warehouseInOutDetail.waterContent)) {
+        if (this.information == '毛重检斤' && !this.deptBudgetList.grossWeight) {
           this.$message({
-            message: '水分(%)非数字!',
+            message: '毛重不能为空',
             type: 'warning',
           })
           return
         }
-        if (
-          this.deptBudgetList.warehouseInOutDetail.waterContent < 1 ||
-          this.deptBudgetList.warehouseInOutDetail.waterContent > 40 ||
-          (String(
-            this.deptBudgetList.warehouseInOutDetail.waterContent
-          ).indexOf('.') != -1 &&
-            String(this.deptBudgetList.warehouseInOutDetail.waterContent)
-              .length -
-              (String(
-                this.deptBudgetList.warehouseInOutDetail.waterContent
-              ).indexOf('.') +
-                1) >
-              2)
-        ) {
+        if (this.information == '毛重检斤' && (
+            this.deptBudgetList.grossWeight <= 0 ||
+            this.deptBudgetList.grossWeight > 200000 ||
+            (String(this.deptBudgetList.grossWeight).indexOf('.') != -1 &&
+              String(this.deptBudgetList.grossWeight).length -
+              (String(this.deptBudgetList.grossWeight).indexOf('.') + 1) >
+              3))) {
           this.$message({
-            message: '水分(%)输入错误! 取值范围1-40之间且可以保留2小数',
+            message: '毛重输入错误',
             type: 'warning',
           })
           return
         }
-      }
-
-      //杂质
-      if (this.deptBudgetList.warehouseInOutDetail.impurity) {
-        if (isNaN(this.deptBudgetList.warehouseInOutDetail.impurity)) {
+        if (this.information == '皮重检斤' && !this.deptBudgetList.tare) {
           this.$message({
-            message: '杂质(%)非数字!',
+            message: '皮重不能为空',
             type: 'warning',
           })
           return
         }
-        if (
-          this.deptBudgetList.warehouseInOutDetail.impurity < 1 ||
-          this.deptBudgetList.warehouseInOutDetail.impurity > 40 ||
-          (String(this.deptBudgetList.warehouseInOutDetail.impurity).indexOf(
-            '.'
-          ) != -1 &&
-            String(this.deptBudgetList.warehouseInOutDetail.impurity).length -
-              (String(
-                this.deptBudgetList.warehouseInOutDetail.impurity
-              ).indexOf('.') +
-                1) >
-              2)
-        ) {
+        if (this.information == '皮重检斤' && (
+            this.deptBudgetList.tare < 0 ||
+            this.deptBudgetList.tare > 200000 ||
+            (String(this.deptBudgetList.tare).indexOf('.') != -1 &&
+              String(this.deptBudgetList.tare).length -
+              (String(this.deptBudgetList.tare).indexOf('.') + 1) >
+              3))) {
           this.$message({
-            message: '杂质(%)输入错误! 取值范围1-40之间且可以保留2小数',
+            message: '皮重输入错误',
             type: 'warning',
           })
           return
         }
-      }
-      //霉变
-      if (this.deptBudgetList.warehouseInOutDetail.mildewGrain) {
-        if (isNaN(this.deptBudgetList.warehouseInOutDetail.mildewGrain)) {
+
+        if (!this.deptBudgetList.carNo) {
           this.$message({
-            message: '霉变粒(%)非数字!',
+            message: '车牌号不能为空',
             type: 'warning',
           })
           return
         }
-        if (
-          this.deptBudgetList.warehouseInOutDetail.mildewGrain < 1 ||
-          this.deptBudgetList.warehouseInOutDetail.mildewGrain > 40 ||
-          (String(this.deptBudgetList.warehouseInOutDetail.mildewGrain).indexOf(
-            '.'
-          ) != -1 &&
-            String(this.deptBudgetList.warehouseInOutDetail.mildewGrain)
-              .length -
-              (String(
-                this.deptBudgetList.warehouseInOutDetail.mildewGrain
-              ).indexOf('.') +
-                1) >
-              2)
-        ) {
+        if (this.deptBudgetList.carNo.length > 7) {
           this.$message({
-            message: '霉变粒(%)输入错误! 取值范围1-40之间且可以保留2小数',
+            message: '车牌号输入错误,请输入7个字符之内',
             type: 'warning',
           })
           return
         }
-      }
-
-      //热损伤
-      if (this.deptBudgetList.warehouseInOutDetail.jiaorenli) {
-        if (isNaN(this.deptBudgetList.warehouseInOutDetail.jiaorenli)) {
+        if (!this.deptBudgetList.contractNo) {
           this.$message({
-            message: '热损伤(%)非数字!',
+            message: '合同编号不能为空',
             type: 'warning',
           })
           return
         }
-        if (
-          this.deptBudgetList.warehouseInOutDetail.jiaorenli < 1 ||
-          this.deptBudgetList.warehouseInOutDetail.jiaorenli > 40 ||
-          (String(this.deptBudgetList.warehouseInOutDetail.jiaorenli).indexOf(
-            '.'
-          ) != -1 &&
-            String(this.deptBudgetList.warehouseInOutDetail.jiaorenli).length -
+        // if (
+        //   this.deptBudgetList.contractNo.length < 6 ||
+        //   this.deptBudgetList.contractNo.length > 20
+        // ) {
+        //   this.$message({
+        //     message: '合同编号长度不符合要求,请输入6-20个字符之内',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        //自检员
+        if (this.deptBudgetList.warehouseInOutDetail.qualityInspector) {
+          if (
+            this.deptBudgetList.warehouseInOutDetail.qualityInspector.length <
+            2 ||
+            this.deptBudgetList.warehouseInOutDetail.qualityInspector.length > 10
+          ) {
+            this.$message({
+              message: '质检员姓名长度错误!',
+              type: 'warning',
+            })
+            return
+          }
+        }
+        if (this.deptBudgetList.warehouseInOutDetail.waterContent) {
+          if (isNaN(this.deptBudgetList.warehouseInOutDetail.waterContent)) {
+            this.$message({
+              message: '水分(%)非数字!',
+              type: 'warning',
+            })
+            return
+          }
+          if (
+            this.deptBudgetList.warehouseInOutDetail.waterContent < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.waterContent > 40 ||
+            (String(
+                this.deptBudgetList.warehouseInOutDetail.waterContent
+              ).indexOf('.') != -1 &&
+              String(this.deptBudgetList.warehouseInOutDetail.waterContent)
+              .length -
               (String(
-                this.deptBudgetList.warehouseInOutDetail.jiaorenli
-              ).indexOf('.') +
+                  this.deptBudgetList.warehouseInOutDetail.waterContent
+                ).indexOf('.') +
                 1) >
               2)
-        ) {
-          this.$message({
-            message: '热损伤(%)输入错误! 取值范围1-40之间且可以保留2小数',
-            type: 'warning',
-          })
-          return
+          ) {
+            this.$message({
+              message: '水分(%)输入错误! 取值范围1-40之间且可以保留2小数',
+              type: 'warning',
+            })
+            return
+          }
         }
-      }
 
-      //不完善粒(%)
-      if (this.deptBudgetList.warehouseInOutDetail.imperfectGrain) {
-        if (isNaN(this.deptBudgetList.warehouseInOutDetail.imperfectGrain)) {
-          this.$message({
-            message: '不完善粒(%)非数字!',
-            type: 'warning',
-          })
-          return
+        //杂质
+        if (this.deptBudgetList.warehouseInOutDetail.impurity) {
+          if (isNaN(this.deptBudgetList.warehouseInOutDetail.impurity)) {
+            this.$message({
+              message: '杂质(%)非数字!',
+              type: 'warning',
+            })
+            return
+          }
+          if (
+            this.deptBudgetList.warehouseInOutDetail.impurity < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.impurity > 40 ||
+            (String(this.deptBudgetList.warehouseInOutDetail.impurity).indexOf(
+                '.'
+              ) != -1 &&
+              String(this.deptBudgetList.warehouseInOutDetail.impurity).length -
+              (String(
+                  this.deptBudgetList.warehouseInOutDetail.impurity
+                ).indexOf('.') +
+                1) >
+              2)
+          ) {
+            this.$message({
+              message: '杂质(%)输入错误! 取值范围1-40之间且可以保留2小数',
+              type: 'warning',
+            })
+            return
+          }
         }
-        if (
-          this.deptBudgetList.warehouseInOutDetail.imperfectGrain < 1 ||
-          this.deptBudgetList.warehouseInOutDetail.imperfectGrain > 40 ||
-          (String(
-            this.deptBudgetList.warehouseInOutDetail.imperfectGrain
-          ).indexOf('.') != -1 &&
-            String(this.deptBudgetList.warehouseInOutDetail.imperfectGrain)
+        //霉变
+        if (this.deptBudgetList.warehouseInOutDetail.mildewGrain) {
+          if (isNaN(this.deptBudgetList.warehouseInOutDetail.mildewGrain)) {
+            this.$message({
+              message: '霉变粒(%)非数字!',
+              type: 'warning',
+            })
+            return
+          }
+          if (
+            this.deptBudgetList.warehouseInOutDetail.mildewGrain < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.mildewGrain > 40 ||
+            (String(this.deptBudgetList.warehouseInOutDetail.mildewGrain).indexOf(
+                '.'
+              ) != -1 &&
+              String(this.deptBudgetList.warehouseInOutDetail.mildewGrain)
               .length -
               (String(
-                this.deptBudgetList.warehouseInOutDetail.imperfectGrain
-              ).indexOf('.') +
+                  this.deptBudgetList.warehouseInOutDetail.mildewGrain
+                ).indexOf('.') +
                 1) >
               2)
-        ) {
-          this.$message({
-            message: '不完善粒(%)输入错误! 取值范围1-40之间且可以保留2小数',
-            type: 'warning',
-          })
-          return
+          ) {
+            this.$message({
+              message: '霉变粒(%)输入错误! 取值范围1-40之间且可以保留2小数',
+              type: 'warning',
+            })
+            return
+          }
         }
-      }
-      //容重
-      if (this.deptBudgetList.warehouseInOutDetail.bulkDensity) {
-        if (isNaN(this.deptBudgetList.warehouseInOutDetail.bulkDensity)) {
-          this.$message({
-            message: '容重(克/升)非数字!',
-            type: 'warning',
-          })
-          return
+
+        //热损伤
+        if (this.deptBudgetList.warehouseInOutDetail.jiaorenli) {
+          if (isNaN(this.deptBudgetList.warehouseInOutDetail.jiaorenli)) {
+            this.$message({
+              message: '热损伤(%)非数字!',
+              type: 'warning',
+            })
+            return
+          }
+          if (
+            this.deptBudgetList.warehouseInOutDetail.jiaorenli < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.jiaorenli > 40 ||
+            (String(this.deptBudgetList.warehouseInOutDetail.jiaorenli).indexOf(
+                '.'
+              ) != -1 &&
+              String(this.deptBudgetList.warehouseInOutDetail.jiaorenli).length -
+              (String(
+                  this.deptBudgetList.warehouseInOutDetail.jiaorenli
+                ).indexOf('.') +
+                1) >
+              2)
+          ) {
+            this.$message({
+              message: '热损伤(%)输入错误! 取值范围1-40之间且可以保留2小数',
+              type: 'warning',
+            })
+            return
+          }
         }
-        if (
-          (this.deptBudgetList.warehouseInOutDetail.bulkDensity &&
-            String(this.deptBudgetList.warehouseInOutDetail.bulkDensity).indexOf('.') != -1 &&
-            String(this.deptBudgetList.warehouseInOutDetail.bulkDensity).length -
-              (String(this.deptBudgetList.warehouseInOutDetail.bulkDensity).indexOf('.') + 1) >
-              2) || this.deptBudgetList.warehouseInOutDetail.bulkDensity > 1000 || this.deptBudgetList.warehouseInOutDetail.bulkDensity < 0
-        ) {
-          this.$message({
-            message: '容重输入错误',
+
+        //不完善粒(%)
+        if (this.deptBudgetList.warehouseInOutDetail.imperfectGrain) {
+          if (isNaN(this.deptBudgetList.warehouseInOutDetail.imperfectGrain)) {
+            this.$message({
+              message: '不完善粒(%)非数字!',
+              type: 'warning',
+            })
+            return
+          }
+          if (
+            this.deptBudgetList.warehouseInOutDetail.imperfectGrain < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.imperfectGrain > 40 ||
+            (String(
+                this.deptBudgetList.warehouseInOutDetail.imperfectGrain
+              ).indexOf('.') != -1 &&
+              String(this.deptBudgetList.warehouseInOutDetail.imperfectGrain)
+              .length -
+              (String(
+                  this.deptBudgetList.warehouseInOutDetail.imperfectGrain
+                ).indexOf('.') +
+                1) >
+              2)
+          ) {
+            this.$message({
+              message: '不完善粒(%)输入错误! 取值范围1-40之间且可以保留2小数',
+              type: 'warning',
+            })
+            return
+          }
+        }
+        //容重
+        if (this.deptBudgetList.warehouseInOutDetail.bulkDensity) {
+          if (isNaN(this.deptBudgetList.warehouseInOutDetail.bulkDensity)) {
+            this.$message({
+              message: '容重(克/升)非数字!',
+              type: 'warning',
+            })
+            return
+          }
+          if (
+            (this.deptBudgetList.warehouseInOutDetail.bulkDensity &&
+              String(this.deptBudgetList.warehouseInOutDetail.bulkDensity).indexOf('.') != -1 &&
+              String(this.deptBudgetList.warehouseInOutDetail.bulkDensity).length -
+              (String(this.deptBudgetList.warehouseInOutDetail.bulkDensity).indexOf('.') + 1) >
+              2) || this.deptBudgetList.warehouseInOutDetail.bulkDensity > 1000 || this.deptBudgetList
+            .warehouseInOutDetail.bulkDensity < 0
+          ) {
+            this.$message({
+              message: '容重输入错误',
+              type: 'warning',
+            })
+            return
+          }
+        }
+        console.log(this.deptBudgetList, '出库!!!!!')
+        this.$confirm(`是否保存皮重检斤`, {
+            cancelButtonText: '取消',
+            confirmButtonText: '确定',
             type: 'warning',
           })
-          return
-        }
-      }
-      console.log(this.deptBudgetList,'出库!!!!!')
-      this.$confirm(`是否保存皮重检斤`, {
-        cancelButtonText: '取消',
-        confirmButtonText: '确定',
-        type: 'warning',
-      })
-        .then(() => {
-          this.$refs.deptBudgetList.validate((valid) => {
-            if (valid) {
-              this.deptBudgetList.compId =  sessionStorage.getItem('ws-pf_compId')
-              this.deptBudgetList.skinInspector = sessionStorage.getItem('ws-pf_staffName')
-              this.deptBudgetList.inOutFlag = 1
-              this.deptBudgetList.pcFlag = 1
-              this.deptBudgetList.statusFlag = 1
-              his.deptBudgetList.grossWeight /= 1000
+          .then(() => {
+            this.$refs.deptBudgetList.validate((valid) => {
+              if (valid) {
+                this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
+                this.deptBudgetList.skinInspector = sessionStorage.getItem('ws-pf_staffName')
+                this.deptBudgetList.inOutFlag = 1
+                this.deptBudgetList.pcFlag = 1
+                this.deptBudgetList.statusFlag = 1
+                his.deptBudgetList.grossWeight /= 1000
                 this.deptBudgetList.tare /= 1000
                 this.deptBudgetList.netWeight /= 1000
                 this.deptBudgetList.pureWeight /= 1000
-              addstorageputList(this.deptBudgetList)
-                .toPromise()
-                .then((response) => {
-                  this.$message.success('保存成功')
-                  this.$router.push({ path: 'warehouseManagementList' })
-                })
-            } else {
-              EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-              return false
-            }
+                addstorageputList(this.deptBudgetList)
+                  .toPromise()
+                  .then((response) => {
+                    this.$message.success('保存成功')
+                    this.$router.push({
+                      path: 'warehouseManagementList'
+                    })
+                  })
+              } else {
+                EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+                return false
+              }
+            })
           })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    //提交按钮
-    submit() {
-      if (!this.deptBudgetList.goodsName) {
-        this.$message({
-          message: '货名不能为空!',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.deptBudgetList.grossWeight) {
-        this.$message({
-          message: '毛重不能为空!',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        this.deptBudgetList.grossWeight <= 0 ||
-        this.deptBudgetList.grossWeight > 5000000 ||
-        (String(this.deptBudgetList.grossWeight).indexOf('.') != -1 &&
-          String(this.deptBudgetList.grossWeight).length -
+          .catch(() => {
+            return false
+          })
+      },
+      //提交按钮
+      submit() {
+        if (!this.deptBudgetList.goodsName) {
+          this.$message({
+            message: '货名不能为空!',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.deptBudgetList.grossWeight) {
+          this.$message({
+            message: '毛重不能为空!',
+            type: 'warning',
+          })
+          return
+        }
+        if (
+          this.deptBudgetList.grossWeight <= 0 ||
+          this.deptBudgetList.grossWeight > 5000000 ||
+          (String(this.deptBudgetList.grossWeight).indexOf('.') != -1 &&
+            String(this.deptBudgetList.grossWeight).length -
             (String(this.deptBudgetList.grossWeight).indexOf('.') + 1) >
             3)
-      ) {
-        this.$message({
-          message: '毛重输入错误',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.deptBudgetList.tare) {
-        this.$message({
-          message: '皮重不能为空!',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        this.deptBudgetList.tare < 0 ||
-        this.deptBudgetList.tare > 500000 ||
-        (String(this.deptBudgetList.tare).indexOf('.') != -1 &&
-          String(this.deptBudgetList.tare).length -
-            (String(this.deptBudgetList.tare).indexOf('.') + 1) >
-            3)
-      ) {
-        this.$message({
-          message: '皮重输入错误',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.deptBudgetList.netWeight) {
-        this.$message({
-          message: '净重不能为空!',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        this.deptBudgetList.netWeight <= 0 ||
-        this.deptBudgetList.netWeight >= 5000000
-      ) {
-        this.$message({
-          message: '净重输入错误!',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.deptBudgetList.grade) {
-        this.$message({
-          message: '品级不能为空!',
-          type: 'warning',
-        })
-        return
-      }
-      if (this.deptBudgetList.type=='潮粮'&&!this.deptBudgetList.buckleWeightRatio) {
-        this.$message({
-          message: '扣重比不能为空',
-          type: 'warning'
-        })
-        return
-      }
-      if (
-        this.deptBudgetList.type=='潮粮'&&this.deptBudgetList.buckleWeightRatio < 0 ||
-        this.deptBudgetList.type=='潮粮'&&this.deptBudgetList.buckleWeightRatio > 3 ||
-        (this.deptBudgetList.type=='潮粮'&&String(this.deptBudgetList.buckleWeightRatio).indexOf('.') != -1 &&
-          String(this.deptBudgetList.buckleWeightRatio).length -
-            (String(this.deptBudgetList.buckleWeightRatio).indexOf('.') + 1) >
-            2)
-      ) {
-        this.$message({
-          message: '扣重比输入错误',
-          type: 'warning'
-        })
-        return
-      }
-      if (this.deptBudgetList.type=='潮粮'&&!this.deptBudgetList.tidalGrainWater) {
-        this.$message({
-          message: '潮粮水分不能为空',
-          type: 'warning'
-        })
-        return
-      }
-      if (
-        this.deptBudgetList.type=='潮粮'&&this.deptBudgetList.tidalGrainWater < 1 ||
-        this.deptBudgetList.type=='潮粮'&&this.deptBudgetList.tidalGrainWater > 40 ||
-        (this.deptBudgetList.type=='潮粮'&&String(this.deptBudgetList.tidalGrainWater).indexOf('.') != -1 &&
-          String(this.deptBudgetList.tidalGrainWater).length -
-            (String(this.deptBudgetList.tidalGrainWater).indexOf('.') + 1) >
-            2)
-      ) {
-        this.$message({
-          message: '潮粮水分输入错误',
-          type: 'warning'
-        })
-        return
-      }
-      if (this.deptBudgetList.type=='潮粮'&&!this.deptBudgetList.solidGrainWater) {
-        this.$message({
-          message: '干粮水分不能为空',
-          type: 'warning'
-        })
-        return
-      }
-      if (
-        this.deptBudgetList.type=='潮粮'&&this.deptBudgetList.solidGrainWater < 1 ||
-        this.deptBudgetList.type=='潮粮'&&this.deptBudgetList.solidGrainWater > 40 ||
-        (this.deptBudgetList.type=='潮粮'&&String(this.deptBudgetList.solidGrainWater).indexOf('.') != -1 &&
-          String(this.deptBudgetList.solidGrainWater).length -
-            (String(this.deptBudgetList.solidGrainWater).indexOf('.') + 1) >
-            1)
-      ) {
-        this.$message({
-          message: '干粮水分输入错误',
-          type: 'warning'
-        })
-        return
-      }
-
-      if (!this.deptBudgetList.agent) {
-        this.$message({
-          message: '经办人不能为空!',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        this.deptBudgetList.agent.length < 2 ||
-        this.deptBudgetList.agent.length > 10
-      ) {
-        this.$message({
-          message: '经办人姓名输入有误!',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.deptBudgetList.inOutDate) {
-        this.$message({
-          message: '出库日期不能为空!',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.deptBudgetList.inOutType) {
-        this.$message({
-          message: '出库类型不能为空!',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.deptBudgetList.carNo) {
-        this.$message({
-          message: '车牌号不能为空!',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        this.deptBudgetList.carNo.length < 6 &&
-        this.deptBudgetList.carNo.length <= 8
-      ) {
-        this.$message({
-          message: '车牌号输入有误!',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.deptBudgetList.contractNo) {
-        this.$message({
-          message: '合同编号不能为空!',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        this.deptBudgetList.contractNo.length < 6 ||
-        this.deptBudgetList.contractNo.length > 50
-      ) {
-        this.$message({
-          message: '合同编号输入有误!',
-          type: 'warning',
-        })
-        return
-      }
-      //自检员
-      if (this.deptBudgetList.warehouseInOutDetail.qualityInspector) {
-        if (
-          this.deptBudgetList.warehouseInOutDetail.qualityInspector.length <
-            2 ||
-          this.deptBudgetList.warehouseInOutDetail.qualityInspector.length > 10
         ) {
           this.$message({
-            message: '质检员姓名长度错误!',
+            message: '毛重输入错误',
             type: 'warning',
           })
           return
         }
-      }
-      if (this.deptBudgetList.warehouseInOutDetail.waterContent) {
-        if (isNaN(this.deptBudgetList.warehouseInOutDetail.waterContent)) {
+        if (!this.deptBudgetList.tare) {
           this.$message({
-            message: '水分(%)非数字!',
+            message: '皮重不能为空!',
             type: 'warning',
           })
           return
         }
         if (
-          this.deptBudgetList.warehouseInOutDetail.waterContent < 1 ||
-          this.deptBudgetList.warehouseInOutDetail.waterContent > 40 ||
-          (String(
-            this.deptBudgetList.warehouseInOutDetail.waterContent
-          ).indexOf('.') != -1 &&
-            String(this.deptBudgetList.warehouseInOutDetail.waterContent)
-              .length -
-              (String(
-                this.deptBudgetList.warehouseInOutDetail.waterContent
-              ).indexOf('.') +
-                1) >
-              2)
+          this.deptBudgetList.tare < 0 ||
+          this.deptBudgetList.tare > 500000 ||
+          (String(this.deptBudgetList.tare).indexOf('.') != -1 &&
+            String(this.deptBudgetList.tare).length -
+            (String(this.deptBudgetList.tare).indexOf('.') + 1) >
+            3)
         ) {
           this.$message({
-            message: '水分(%)输入错误! 取值范围1-40之间且可以保留2小数',
+            message: '皮重输入错误',
             type: 'warning',
           })
           return
         }
-      }
-
-      //杂质
-      if (this.deptBudgetList.warehouseInOutDetail.impurity) {
-        if (isNaN(this.deptBudgetList.warehouseInOutDetail.impurity)) {
+        if (!this.deptBudgetList.netWeight) {
           this.$message({
-            message: '杂质(%)非数字!',
+            message: '净重不能为空!',
             type: 'warning',
           })
           return
         }
         if (
-          this.deptBudgetList.warehouseInOutDetail.impurity < 1 ||
-          this.deptBudgetList.warehouseInOutDetail.impurity > 40 ||
-          (String(this.deptBudgetList.warehouseInOutDetail.impurity).indexOf(
-            '.'
-          ) != -1 &&
-            String(this.deptBudgetList.warehouseInOutDetail.impurity).length -
-              (String(
-                this.deptBudgetList.warehouseInOutDetail.impurity
-              ).indexOf('.') +
-                1) >
-              2)
+          this.deptBudgetList.netWeight <= 0 ||
+          this.deptBudgetList.netWeight >= 5000000
         ) {
           this.$message({
-            message: '杂质(%)输入错误! 取值范围1-40之间且可以保留2小数',
+            message: '净重输入错误!',
             type: 'warning',
           })
           return
         }
-      }
-      //霉变
-      if (this.deptBudgetList.warehouseInOutDetail.mildewGrain) {
-        if (isNaN(this.deptBudgetList.warehouseInOutDetail.mildewGrain)) {
+        if (!this.deptBudgetList.grade) {
           this.$message({
-            message: '霉变粒(%)非数字!',
+            message: '品级不能为空!',
             type: 'warning',
           })
           return
         }
+        if (this.deptBudgetList.type == '潮粮' && !this.deptBudgetList.buckleWeightRatio) {
+          this.$message({
+            message: '扣重比不能为空',
+            type: 'warning'
+          })
+          return
+        }
         if (
-          this.deptBudgetList.warehouseInOutDetail.mildewGrain < 1 ||
-          this.deptBudgetList.warehouseInOutDetail.mildewGrain > 40 ||
-          (String(this.deptBudgetList.warehouseInOutDetail.mildewGrain).indexOf(
-            '.'
-          ) != -1 &&
-            String(this.deptBudgetList.warehouseInOutDetail.mildewGrain)
-              .length -
-              (String(
-                this.deptBudgetList.warehouseInOutDetail.mildewGrain
-              ).indexOf('.') +
-                1) >
-              2)
+          this.deptBudgetList.type == '潮粮' && this.deptBudgetList.buckleWeightRatio < 0 ||
+          this.deptBudgetList.type == '潮粮' && this.deptBudgetList.buckleWeightRatio > 3 ||
+          (this.deptBudgetList.type == '潮粮' && String(this.deptBudgetList.buckleWeightRatio).indexOf('.') != -1 &&
+            String(this.deptBudgetList.buckleWeightRatio).length -
+            (String(this.deptBudgetList.buckleWeightRatio).indexOf('.') + 1) >
+            2)
         ) {
           this.$message({
-            message: '霉变粒(%)输入错误! 取值范围1-40之间且可以保留2小数',
-            type: 'warning',
+            message: '扣重比输入错误',
+            type: 'warning'
+          })
+          return
+        }
+        if (this.deptBudgetList.type == '潮粮' && !this.deptBudgetList.tidalGrainWater) {
+          this.$message({
+            message: '潮粮水分不能为空',
+            type: 'warning'
+          })
+          return
+        }
+        if (
+          this.deptBudgetList.type == '潮粮' && this.deptBudgetList.tidalGrainWater < 1 ||
+          this.deptBudgetList.type == '潮粮' && this.deptBudgetList.tidalGrainWater > 40 ||
+          (this.deptBudgetList.type == '潮粮' && String(this.deptBudgetList.tidalGrainWater).indexOf('.') != -1 &&
+            String(this.deptBudgetList.tidalGrainWater).length -
+            (String(this.deptBudgetList.tidalGrainWater).indexOf('.') + 1) >
+            2)
+        ) {
+          this.$message({
+            message: '潮粮水分输入错误',
+            type: 'warning'
+          })
+          return
+        }
+        if (this.deptBudgetList.type == '潮粮' && !this.deptBudgetList.solidGrainWater) {
+          this.$message({
+            message: '干粮水分不能为空',
+            type: 'warning'
+          })
+          return
+        }
+        if (
+          this.deptBudgetList.type == '潮粮' && this.deptBudgetList.solidGrainWater < 1 ||
+          this.deptBudgetList.type == '潮粮' && this.deptBudgetList.solidGrainWater > 40 ||
+          (this.deptBudgetList.type == '潮粮' && String(this.deptBudgetList.solidGrainWater).indexOf('.') != -1 &&
+            String(this.deptBudgetList.solidGrainWater).length -
+            (String(this.deptBudgetList.solidGrainWater).indexOf('.') + 1) >
+            1)
+        ) {
+          this.$message({
+            message: '干粮水分输入错误',
+            type: 'warning'
           })
           return
         }
-      }
 
-      //热损伤
-      if (this.deptBudgetList.warehouseInOutDetail.jiaorenli) {
-        if (isNaN(this.deptBudgetList.warehouseInOutDetail.jiaorenli)) {
+        if (!this.deptBudgetList.agent) {
           this.$message({
-            message: '热损伤(%)非数字!',
+            message: '经办人不能为空!',
             type: 'warning',
           })
           return
         }
         if (
-          this.deptBudgetList.warehouseInOutDetail.jiaorenli < 1 ||
-          this.deptBudgetList.warehouseInOutDetail.jiaorenli > 40 ||
-          (String(this.deptBudgetList.warehouseInOutDetail.jiaorenli).indexOf(
-            '.'
-          ) != -1 &&
-            String(this.deptBudgetList.warehouseInOutDetail.jiaorenli).length -
-              (String(
-                this.deptBudgetList.warehouseInOutDetail.jiaorenli
-              ).indexOf('.') +
-                1) >
-              2)
+          this.deptBudgetList.agent.length < 2 ||
+          this.deptBudgetList.agent.length > 10
         ) {
           this.$message({
-            message: '热损伤(%)输入错误! 取值范围1-40之间且可以保留2小数',
+            message: '经办人姓名输入有误!',
             type: 'warning',
           })
           return
         }
-      }
-
-      //不完善粒(%)
-      if (this.deptBudgetList.warehouseInOutDetail.imperfectGrain) {
-        if (isNaN(this.deptBudgetList.warehouseInOutDetail.imperfectGrain)) {
+        if (!this.deptBudgetList.inOutDate) {
           this.$message({
-            message: '不完善粒(%)非数字!',
+            message: '出库日期不能为空!',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.deptBudgetList.inOutType) {
+          this.$message({
+            message: '出库类型不能为空!',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.deptBudgetList.carNo) {
+          this.$message({
+            message: '车牌号不能为空!',
             type: 'warning',
           })
           return
         }
         if (
-          this.deptBudgetList.warehouseInOutDetail.imperfectGrain < 1 ||
-          this.deptBudgetList.warehouseInOutDetail.imperfectGrain > 40 ||
-          (String(
-            this.deptBudgetList.warehouseInOutDetail.imperfectGrain
-          ).indexOf('.') != -1 &&
-            String(this.deptBudgetList.warehouseInOutDetail.imperfectGrain)
-              .length -
-              (String(
-                this.deptBudgetList.warehouseInOutDetail.imperfectGrain
-              ).indexOf('.') +
-                1) >
-              2)
+          this.deptBudgetList.carNo.length < 6 &&
+          this.deptBudgetList.carNo.length <= 8
         ) {
           this.$message({
-            message: '不完善粒(%)输入错误! 取值范围1-40之间且可以保留2小数',
+            message: '车牌号输入有误!',
             type: 'warning',
           })
           return
         }
-      }
-      //容重
-      if (this.deptBudgetList.warehouseInOutDetail.bulkDensity) {
-        if (isNaN(this.deptBudgetList.warehouseInOutDetail.bulkDensity)) {
+        if (!this.deptBudgetList.contractNo) {
           this.$message({
-            message: '容重(克/升)非数字!',
+            message: '合同编号不能为空!',
             type: 'warning',
           })
           return
         }
-          if (
-          (this.deptBudgetList.warehouseInOutDetail.bulkDensity &&
-            String(this.deptBudgetList.warehouseInOutDetail.bulkDensity).indexOf('.') != -1 &&
-            String(this.deptBudgetList.warehouseInOutDetail.bulkDensity).length -
-              (String(this.deptBudgetList.warehouseInOutDetail.bulkDensity).indexOf('.') + 1) >
-              2) || this.deptBudgetList.warehouseInOutDetail.bulkDensity > 1000 || this.deptBudgetList.warehouseInOutDetail.bulkDensity < 0
+        if (
+          this.deptBudgetList.contractNo.length < 6 ||
+          this.deptBudgetList.contractNo.length > 50
         ) {
           this.$message({
-            message: '容重输入错误',
+            message: '合同编号输入有误!',
             type: 'warning',
           })
           return
         }
-      }
-      this.$confirm(`确定提交出库信息`, {
-        cancelButtonText: '取消',
-        confirmButtonText: '确定',
-        type: 'warning',
-      }).then(() => {
-        this.$refs.deptBudgetList.validate((valid) => {
-          if (valid) {
-             this.deptBudgetList.grossWeight /= 1000
-                this.deptBudgetList.tare /= 1000
-                this.deptBudgetList.netWeight /= 1000
-                this.deptBudgetList.pureWeight /= 1000
-                this.deptBudgetList.deductionAmount *= 1000
-                this.deptBudgetList.deductionWeight /= 1000
-            this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
-            this.deptBudgetList.skinInspector = sessionStorage.getItem('ws-pf_staffName')
-            this.deptBudgetList.inOutFlag = 1
-            this.deptBudgetList.statusFlag = 3
-            addstorageputList(this.deptBudgetList)
-              .toPromise()
-              .then((response) => {
-                this.$message.success('添加成功')
-                this.$router.push({ path: 'warehouseManagementList' })
-              })
-          } else {
-            EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-            return false
+        //自检员
+        if (this.deptBudgetList.warehouseInOutDetail.qualityInspector) {
+          if (
+            this.deptBudgetList.warehouseInOutDetail.qualityInspector.length <
+            2 ||
+            this.deptBudgetList.warehouseInOutDetail.qualityInspector.length > 10
+          ) {
+            this.$message({
+              message: '质检员姓名长度错误!',
+              type: 'warning',
+            })
+            return
           }
-        })
-      })
-    },
-    tarechange(e) {
-      if (this.deptBudgetList.grossWeight && this.deptBudgetList.tare) {
-        this.deptBudgetList.netWeight = Number(
-          this.deptBudgetList.grossWeight - this.deptBudgetList.tare
-        )
-      }
-    },
-    grossWeightchange(e) {
-      if (this.deptBudgetList.grossWeight && this.deptBudgetList.tare) {
-        this.deptBudgetList.netWeight = Number(
-          this.deptBudgetList.grossWeight - this.deptBudgetList.tare
-        )
-      }
-    },
-    selectgoodsName(e) {
-      for (var i = 0; i < this.goodnameList.length; i++) {
-        if (this.goodnameList[i].goodsName == e) {
-          this.deptBudgetList.goodsNameKey = this.goodnameList[i].goodsNameKey
         }
-      }
-    },
-    selectpackingMethod(e) {
-      for (var i = 0; i < this.packtypeList.length; i++) {
-        if (this.packtypeList[i].constValue == e) {
-          this.deptBudgetList.packingMethodKey = this.packtypeList[i].constKey
+        if (this.deptBudgetList.warehouseInOutDetail.waterContent) {
+          if (isNaN(this.deptBudgetList.warehouseInOutDetail.waterContent)) {
+            this.$message({
+              message: '水分(%)非数字!',
+              type: 'warning',
+            })
+            return
+          }
+          if (
+            this.deptBudgetList.warehouseInOutDetail.waterContent < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.waterContent > 40 ||
+            (String(
+                this.deptBudgetList.warehouseInOutDetail.waterContent
+              ).indexOf('.') != -1 &&
+              String(this.deptBudgetList.warehouseInOutDetail.waterContent)
+              .length -
+              (String(
+                  this.deptBudgetList.warehouseInOutDetail.waterContent
+                ).indexOf('.') +
+                1) >
+              2)
+          ) {
+            this.$message({
+              message: '水分(%)输入错误! 取值范围1-40之间且可以保留2小数',
+              type: 'warning',
+            })
+            return
+          }
         }
-      }
-    },
-    selectstorageType(e) {
-      for (var i = 0; i < this.deliveryType.length; i++) {
-        if (this.deliveryType[i].constValue == e) {
-          this.deptBudgetList.inOutTypeKey = this.deliveryType[i].constKey
+
+        //杂质
+        if (this.deptBudgetList.warehouseInOutDetail.impurity) {
+          if (isNaN(this.deptBudgetList.warehouseInOutDetail.impurity)) {
+            this.$message({
+              message: '杂质(%)非数字!',
+              type: 'warning',
+            })
+            return
+          }
+          if (
+            this.deptBudgetList.warehouseInOutDetail.impurity < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.impurity > 40 ||
+            (String(this.deptBudgetList.warehouseInOutDetail.impurity).indexOf(
+                '.'
+              ) != -1 &&
+              String(this.deptBudgetList.warehouseInOutDetail.impurity).length -
+              (String(
+                  this.deptBudgetList.warehouseInOutDetail.impurity
+                ).indexOf('.') +
+                1) >
+              2)
+          ) {
+            this.$message({
+              message: '杂质(%)输入错误! 取值范围1-40之间且可以保留2小数',
+              type: 'warning',
+            })
+            return
+          }
+        }
+        //霉变
+        if (this.deptBudgetList.warehouseInOutDetail.mildewGrain) {
+          if (isNaN(this.deptBudgetList.warehouseInOutDetail.mildewGrain)) {
+            this.$message({
+              message: '霉变粒(%)非数字!',
+              type: 'warning',
+            })
+            return
+          }
+          if (
+            this.deptBudgetList.warehouseInOutDetail.mildewGrain < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.mildewGrain > 40 ||
+            (String(this.deptBudgetList.warehouseInOutDetail.mildewGrain).indexOf(
+                '.'
+              ) != -1 &&
+              String(this.deptBudgetList.warehouseInOutDetail.mildewGrain)
+              .length -
+              (String(
+                  this.deptBudgetList.warehouseInOutDetail.mildewGrain
+                ).indexOf('.') +
+                1) >
+              2)
+          ) {
+            this.$message({
+              message: '霉变粒(%)输入错误! 取值范围1-40之间且可以保留2小数',
+              type: 'warning',
+            })
+            return
+          }
         }
-      }
-    },
-    handleClose() {
-      this.accessoryTFs = false
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getList()
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val
-      console.log(`当前页: ${val}`)
-      this.getList()
-    },
-    getList() {
-      // 品级
-      pullDown({ constId: 'CON3' })
-        .toPromise()
-        .then((response) => {
-          this.gradeList = response
-        })
 
-      // 类型
-      if (this.deptBudgetList.warehouseType == 1) {
-        // 货名
-        goodsname({ positionId: this.$route.query.positionId })
-          .toPromise()
-          .then((response) => {
-            this.goodnameList = response
+        //热损伤
+        if (this.deptBudgetList.warehouseInOutDetail.jiaorenli) {
+          if (isNaN(this.deptBudgetList.warehouseInOutDetail.jiaorenli)) {
+            this.$message({
+              message: '热损伤(%)非数字!',
+              type: 'warning',
+            })
+            return
+          }
+          if (
+            this.deptBudgetList.warehouseInOutDetail.jiaorenli < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.jiaorenli > 40 ||
+            (String(this.deptBudgetList.warehouseInOutDetail.jiaorenli).indexOf(
+                '.'
+              ) != -1 &&
+              String(this.deptBudgetList.warehouseInOutDetail.jiaorenli).length -
+              (String(
+                  this.deptBudgetList.warehouseInOutDetail.jiaorenli
+                ).indexOf('.') +
+                1) >
+              2)
+          ) {
+            this.$message({
+              message: '热损伤(%)输入错误! 取值范围1-40之间且可以保留2小数',
+              type: 'warning',
+            })
+            return
+          }
+        }
+
+        //不完善粒(%)
+        if (this.deptBudgetList.warehouseInOutDetail.imperfectGrain) {
+          if (isNaN(this.deptBudgetList.warehouseInOutDetail.imperfectGrain)) {
+            this.$message({
+              message: '不完善粒(%)非数字!',
+              type: 'warning',
+            })
+            return
+          }
+          if (
+            this.deptBudgetList.warehouseInOutDetail.imperfectGrain < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.imperfectGrain > 40 ||
+            (String(
+                this.deptBudgetList.warehouseInOutDetail.imperfectGrain
+              ).indexOf('.') != -1 &&
+              String(this.deptBudgetList.warehouseInOutDetail.imperfectGrain)
+              .length -
+              (String(
+                  this.deptBudgetList.warehouseInOutDetail.imperfectGrain
+                ).indexOf('.') +
+                1) >
+              2)
+          ) {
+            this.$message({
+              message: '不完善粒(%)输入错误! 取值范围1-40之间且可以保留2小数',
+              type: 'warning',
+            })
+            return
+          }
+        }
+        //容重
+        if (this.deptBudgetList.warehouseInOutDetail.bulkDensity) {
+          if (isNaN(this.deptBudgetList.warehouseInOutDetail.bulkDensity)) {
+            this.$message({
+              message: '容重(克/升)非数字!',
+              type: 'warning',
+            })
+            return
+          }
+          if (
+            (this.deptBudgetList.warehouseInOutDetail.bulkDensity &&
+              String(this.deptBudgetList.warehouseInOutDetail.bulkDensity).indexOf('.') != -1 &&
+              String(this.deptBudgetList.warehouseInOutDetail.bulkDensity).length -
+              (String(this.deptBudgetList.warehouseInOutDetail.bulkDensity).indexOf('.') + 1) >
+              2) || this.deptBudgetList.warehouseInOutDetail.bulkDensity > 1000 || this.deptBudgetList
+            .warehouseInOutDetail.bulkDensity < 0
+          ) {
+            this.$message({
+              message: '容重输入错误',
+              type: 'warning',
+            })
+            return
+          }
+        }
+        this.$confirm(`确定提交出库信息`, {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning',
+        }).then(() => {
+          this.$refs.deptBudgetList.validate((valid) => {
+            if (valid) {
+              this.deptBudgetList.grossWeight /= 1000
+              this.deptBudgetList.tare /= 1000
+              this.deptBudgetList.netWeight /= 1000
+              this.deptBudgetList.pureWeight /= 1000
+              this.deptBudgetList.deductionAmount *= 1000
+              this.deptBudgetList.deductionWeight /= 1000
+              this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
+              this.deptBudgetList.skinInspector = sessionStorage.getItem('ws-pf_staffName')
+              this.deptBudgetList.inOutFlag = 1
+              this.deptBudgetList.statusFlag = 3
+              addstorageputList(this.deptBudgetList)
+                .toPromise()
+                .then((response) => {
+                  this.$message.success('添加成功')
+                  this.$router.push({
+                    path: 'warehouseManagementList'
+                  })
+                })
+            } else {
+              EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              return false
+            }
+          })
+        })
+      },
+      tarechange(e) {
+        if (this.deptBudgetList.grossWeight && this.deptBudgetList.tare) {
+          this.deptBudgetList.netWeight = Number(
+            this.deptBudgetList.grossWeight - this.deptBudgetList.tare
+          )
+        }
+      },
+      grossWeightchange(e) {
+        if (this.deptBudgetList.grossWeight && this.deptBudgetList.tare) {
+          this.deptBudgetList.netWeight = Number(
+            this.deptBudgetList.grossWeight - this.deptBudgetList.tare
+          )
+        }
+      },
+      selectgoodsName(e) {
+        for (var i = 0; i < this.goodnameList.length; i++) {
+          if (this.goodnameList[i].goodsName == e) {
+            this.deptBudgetList.goodsNameKey = this.goodnameList[i].goodsNameKey
+          }
+        }
+      },
+      selectpackingMethod(e) {
+        for (var i = 0; i < this.packtypeList.length; i++) {
+          if (this.packtypeList[i].constValue == e) {
+            this.deptBudgetList.packingMethodKey = this.packtypeList[i].constKey
+          }
+        }
+      },
+      selectstorageType(e) {
+        for (var i = 0; i < this.deliveryType.length; i++) {
+          if (this.deliveryType[i].constValue == e) {
+            this.deptBudgetList.inOutTypeKey = this.deliveryType[i].constKey
+          }
+        }
+      },
+      handleClose() {
+        this.accessoryTFs = false
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+      getList() {
+        // 品级
+        pullDown({
+            constId: 'CON3'
           })
-        //类型
-        pullDown({ constId: 'CON6' })
           .toPromise()
           .then((response) => {
-            this.deliveryType = response
+            this.gradeList = response
+          })
+
+        // 类型
+        if (this.deptBudgetList.warehouseType == 1) {
+          // 货名
+          goodsname({
+              positionId: this.$route.query.positionId
+            })
+            .toPromise()
+            .then((response) => {
+              this.goodnameList = response
+            })
+          //类型
+          pullDown({
+              constId: 'CON6'
+            })
+            .toPromise()
+            .then((response) => {
+              this.deliveryType = response
+            })
+        } else if (this.deptBudgetList.warehouseType == 2) {
+          goodsnameXiala({
+              baseId: this.deptBudgetList.warehouseId
+            })
+            .toPromise()
+            .then((response) => {
+              this.goodnameList = response
+            })
+          pullDown({
+              constId: 'WARE2'
+            })
+            .toPromise()
+            .then((response) => {
+              this.deliveryType = response
+            })
+        }
+        //合同编号
+        xialaNo({
+            compId: sessionStorage.getItem('ws-pf_compId'),
+            flag: 5
           })
-      } else if (this.deptBudgetList.warehouseType == 2) {
-        goodsnameXiala({ baseId: this.deptBudgetList.warehouseId })
           .toPromise()
           .then((response) => {
-            this.goodnameList = response
+            this.outContractNo = response
+          })
+        //经办人
+        getstaff({
+            compId: sessionStorage.getItem('ws-pf_compId'),
+            warehouseId: this.deptBudgetList.baseId
           })
-        pullDown({ constId: 'WARE2' })
           .toPromise()
           .then((response) => {
-            this.deliveryType = response
+            // this.agent = response
+            this.qualityInspectorList = response
+            this.options = response
+            this.staffList = response
           })
-      }
-      //合同编号
-      xialaNo({ compId: sessionStorage.getItem('ws-pf_compId'),flag:5  })
-        .toPromise()
-        .then((response) => {
-          this.outContractNo = response
-        })
-      //经办人
-      getstaff({ compId: sessionStorage.getItem('ws-pf_compId'),warehouseId:this.deptBudgetList.baseId })
-        .toPromise()
-        .then((response) => {
-          // this.agent = response
-          this.qualityInspectorList = response
-          this.options = response
-           this.staffList = response
-        })
-    },
-    selecttaskType(e) {
-      for (var i = 0; i < this.taskTypeList.length; i++) {
-        if (this.taskTypeList[i].value == e) {
-          this.searchType = this.taskTypeList[i].type
+      },
+      selecttaskType(e) {
+        for (var i = 0; i < this.taskTypeList.length; i++) {
+          if (this.taskTypeList[i].value == e) {
+            this.searchType = this.taskTypeList[i].type
+          }
         }
-      }
-    },
-    fujian(row) {
-      if (
-        row.receiveAttachmentPath === null ||
-        row.receiveAttachmentPath === ''
-      ) {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
-      } else {
-        this.accessoryTFs = true
-      }
-      this.appendixIdss = row.receiveAttachmentPath
-    },
-    handleExamine(row) {
-      this.$router.push({
-        name: 'salesContractExamine',
-        query: { id: row.id },
-      })
+      },
+      fujian(row) {
+        if (
+          row.receiveAttachmentPath === null ||
+          row.receiveAttachmentPath === ''
+        ) {
+          EventBus.$emit(
+            'warning',
+            this.$t('system.noticeCircular.NoInformation')
+          )
+        } else {
+          this.accessoryTFs = true
+        }
+        this.appendixIdss = row.receiveAttachmentPath
+      },
+      handleExamine(row) {
+        this.$router.push({
+          name: 'salesContractExamine',
+          query: {
+            id: row.id
+          },
+        })
+      },
+      //删除
+      approve() {},
+      listQuery() {},
+      total() {},
+      clearfiltQuery() {},
+      selectCrtDuty() {},
     },
-    //删除
-    approve() {},
-    listQuery() {},
-    total() {},
-    clearfiltQuery() {},
-    selectCrtDuty() {},
-  },
-}
+  }
 </script>
 <style lang="scss" scoped>
-/deep/.basicInformation {
-  .ws-info-table {
-    border: none;
-  }
-  .el-form-item {
-    width: 33.3333%;
-    border: none;
-    .el-form-item__label {
-      background: transparent;
+  /deep/.basicInformation {
+    .ws-info-table {
       border: none;
     }
-    .el-form-item__content {
+
+    .el-form-item {
+      width: 33.3333%;
       border: none;
+
+      .el-form-item__label {
+        background: transparent;
+        border: none;
+      }
+
+      .el-form-item__content {
+        border: none;
+      }
     }
   }
-}
-.el-button--default {
-  color: #5473e8;
-  border-color: #5473e8;
-}
-.title {
-  position: relative;
-  padding-left: 10px;
-}
-.title::before {
-  content: '';
-  display: inline-block;
-  width: 5px;
-  height: 30px;
-  background: #5473e8;
-  position: absolute;
-  left: 0;
-}
-.el-form {
-  padding: 0 10%;
-}
-.el-button--primary {
-  background-color: #5878e8;
-  border-color: #5878e8;
-}
-.el-col {
-  background: #f6f7fc;
-}
-.bg-right {
-  text-align: right;
-  padding: 16px 20px;
-}
-.center {
-  position: relative;
-  top: 50px;
-  width: 40%;
-  height: 2000px;
-  margin: 0 auto;
-}
-//选填
-/deep/.el-form-item {
-  width: 50%;
-}
-.container {
-  overflow: scroll;
-  height: 120vh;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  text-align: center;
-}
-.deliverydate {
-  display: inline-block;
-  width: 10%;
-}
-.center {
-  margin-top: -60px;
-  width: 80%;
-}
-//仓位
-.position {
-  background: #afb5cb;
-  border-radius: 2px;
-  font-size: 12px;
-  color: #ffffff;
-  line-height: 20px;
-  padding: 2px 4px;
-  position: relative;
-  top: -2px;
-}
-.neifor /deep/.ws-info-table .el-form-item .el-form-item__label {
-  background: #f6f7fc;
-}
-.neifor .ws-info-table {
-  border-left: 1px solid #cdd2dc;
-  border-top: 1px solid #cdd2dc;
-}
-.neifor .ws-info-table .el-form-item {
-  border-right: 1px solid #cdd2dc;
-  border-bottom: 1px solid #cdd2dc;
-}
-.inspector /deep/.ws-info-table .el-form-item .el-form-item__label {
-  width: 59px;
-}
-//表格文字
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  text-align: center;
-  font-size: 14px;
-  font-family: PingFangSC-Regular, PingFang SC;
-  font-weight: 400;
-  color: #8890b1;
-  line-height: 16px;
-}
-.inspector {
-  width: 50%;
-}
-//质检员
-.inspector .el-form-item__content {
-  text-align: left;
-  margin-left: 0px;
-}
 
-.small-title {
-  position: relative;
-  padding: 10px;
-  font-weight: 600;
-}
-.small-title::before {
-  position: absolute;
-  content: '';
-  display: block;
-  background: #5473e8;
-  width: 4px;
-  height: 14px;
-  left: 0px;
-  top: 13px;
-}
-//下面列表
-.neifor {
-  width: 80%;
-  background-color: #f6f7fc;
-}
-/deep/.neifor .ws-info-table .el-form-item .el-form-item__label {
-  width: 35%;
-  text-align: center;
-}
-/deep/.neifor .ws-info-table .el-form-item .el-form-item__content {
-  width: 60%;
-  background-color: #f6f7fc;
-}
-/deep/.neifor .el-input--small .el-input__inner {
-  width: 100%;
-}
-</style>
+  .el-button--default {
+    color: #5473e8;
+    border-color: #5473e8;
+  }
+
+  .title {
+    position: relative;
+    padding-left: 10px;
+  }
+
+  .title::before {
+    content: '';
+    display: inline-block;
+    width: 5px;
+    height: 30px;
+    background: #5473e8;
+    position: absolute;
+    left: 0;
+  }
+
+  .el-form {
+    padding: 0 10%;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+  }
+
+  .el-col {
+    background: #f6f7fc;
+  }
+
+  .bg-right {
+    text-align: right;
+    padding: 16px 20px;
+  }
+
+  .center {
+    position: relative;
+    top: 50px;
+    width: 40%;
+    height: 2000px;
+    margin: 0 auto;
+  }
+
+  //选填
+  /deep/.el-form-item {
+    width: 50%;
+  }
+
+  .container {
+    overflow: scroll;
+    height: 120vh;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__label {
+    text-align: center;
+  }
+
+  .deliverydate {
+    display: inline-block;
+    width: 10%;
+  }
+
+  .center {
+    margin-top: -60px;
+    width: 80%;
+  }
+
+  //仓位
+  .position {
+    background: #afb5cb;
+    border-radius: 2px;
+    font-size: 12px;
+    color: #ffffff;
+    line-height: 20px;
+    padding: 2px 4px;
+    position: relative;
+    top: -2px;
+  }
+
+  .neifor /deep/.ws-info-table .el-form-item .el-form-item__label {
+    background: #f6f7fc;
+  }
+
+  .neifor .ws-info-table {
+    border-left: 1px solid #cdd2dc;
+    border-top: 1px solid #cdd2dc;
+  }
+
+  .neifor .ws-info-table .el-form-item {
+    border-right: 1px solid #cdd2dc;
+    border-bottom: 1px solid #cdd2dc;
+  }
+
+  .inspector /deep/.ws-info-table .el-form-item .el-form-item__label {
+    width: 59px;
+  }
+
+  //表格文字
+  /deep/.ws-info-table .el-form-item .el-form-item__label {
+    text-align: center;
+    font-size: 14px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #8890b1;
+    line-height: 16px;
+  }
+
+  .inspector {
+    width: 50%;
+  }
+
+  //质检员
+  .inspector .el-form-item__content {
+    text-align: left;
+    margin-left: 0px;
+  }
+
+  .small-title {
+    position: relative;
+    padding: 10px;
+    font-weight: 600;
+  }
+
+  .small-title::before {
+    position: absolute;
+    content: '';
+    display: block;
+    background: #5473e8;
+    width: 4px;
+    height: 14px;
+    left: 0px;
+    top: 13px;
+  }
+
+  //下面列表
+  .neifor {
+    width: 80%;
+    background-color: #f6f7fc;
+  }
+
+  /deep/.neifor .ws-info-table .el-form-item .el-form-item__label {
+    width: 35%;
+    text-align: center;
+  }
+
+  /deep/.neifor .ws-info-table .el-form-item .el-form-item__content {
+    width: 60%;
+    background-color: #f6f7fc;
+  }
+
+  /deep/.neifor .el-input--small .el-input__inner {
+    width: 100%;
+  }
+</style>

+ 0 - 1
src/views/workNotification/work.vue

@@ -359,7 +359,6 @@ export default {
           content.forEach(item => {
             //   // if (item.businessType === notificationType.CREW) {
             //   //   // 船员管理
-            //   //   debugger
             //   //   this.number.crew = item.number;
             //   //   this.number.sum += parseInt(item.number);
             //   // } else if (item.businessType === notificationType.FINANCE) {

+ 0 - 1
src/viewsjs/crew/crewManagement/crewDetailMsg/contractMsg.js

@@ -351,7 +351,6 @@ export default {
             if (this.contractMsgEdit.contractTermEnd === '' || this.contractMsgEdit.contractTermEnd === undefined || this.contractMsgEdit.contractTermEnd === null) {
               this.contractMsgEdit.contractTermEnd = 0
             }
-            // debugger
             SeafarerContractSaveEdit(this.contractMsgEdit).toPromise().then(response => {
               this.loading = false
               EventBus.$emit('success', this.$t('showMessage.saveSuccessfully'))

+ 0 - 1
src/viewsjs/procurement/procurementMaterial/applEmail.js

@@ -229,7 +229,6 @@ export default {
   },
   mounted () {
     // this.getSupplier()
-    // debugger
     // this.getFileInfo()
     // this.exportFile()
   },

Некоторые файлы не были показаны из-за большого количества измененных файлов