前端

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -86,9 +86,11 @@
               <el-input v-else v-model="deptBudgetList.tranPriceIng" maxlength="70" />
             </el-form-item>
             <div class="input-item-margin">
-              <el-button v-if="deptBudgetList.priceStatus=='审核中'" type="primary"
+              <div v-if="deptBudgetList.priceStatus=='审核中'">
+                <el-button type="primary"
                 v-hasPermission="`tranManager.vehicleDispatching.reprice`" size="small" @click="examine()">审核中
               </el-button>
+              </div>
               <el-button v-else type="primary" @click="priceSubmit()">提交</el-button>
             </div>
           </div>

src/views/warehouse/warehouseManagementTare.vue

@@ -42,6 +42,432 @@
           <div class="car-no">{{ deptBudgetList.carNo }}</div>
         </div>
         <div class="small-title">基本信息</div>
+        <div class='left' style='width:66.6666%;'>
+         <!-- <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>
+          </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-form-item>
+          <ws-form-item label="合同编号" span="1" prop="contractNo">
+            <ws-select
+              disabled
+              v-model="deptBudgetList.contractNo"
+              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"
+            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-form-item>
+          <ws-form-item label="提示" span="1" prop="tips">
+            <ws-input
+              onmouseover="this.title=this.value"
+              v-model="deptBudgetList.tips"
+              maxlength="20"
+              size="small"
+            />
+          </ws-form-item>
+          <ws-form-item label="净重（公斤）" span="1" prop="netWeight">
+            <ws-input
+              disabled
+              v-model="deptBudgetList.netWeight"
+              placeholder="不可编辑，自动计算"
+              maxlength="120"
+              size="small"
+            />
+          </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>
+          </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>
+          <ws-form-item label="类型" span="1" prop="type">
+            <ws-select
+              disabled
+              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">
+            <ws-input
+              v-model="deptBudgetList.inOutType"
+              class="right-bottom"
+              :disabled="isSelectType"
+              placeholder="暂无"
+            />
+           
+          </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-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>
+          <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-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>
+          </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>
+          </ws-form-item>
+
+          <ws-form-item label="出库方式" span="1" prop="outType">
+            <el-select
+              v-model="deptBudgetList.outType"
+              placeholder="请选择出库方式"
+            >
+              <el-option
+                v-for="item in multiSelector"
+                :key="item.value"
+                :label="item.name"
+                :value="item.name"
+              />
+            </el-select>
+          </ws-form-item>
+
+          <ws-form-item
+            label="车牌号"
+            span="1"
+            prop="carNo"
+            v-if="
+              deptBudgetList.outType == '汽运' ||
+              deptBudgetList.outType == '集装箱船'
+            "
+          >
+            <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-form-item
+            label="车号"
+            span="1"
+            prop="carNo"
+            v-if="deptBudgetList.outType == '火运'"
+          >
+            <ws-input
+              v-model="deptBudgetList.carNo"
+              placeholder="请输入车号"
+              size="small"
+            />
+          </ws-form-item>
+          <ws-form-item
+            label="箱号-1"
+            span="1"
+            prop="boxNo"
+            v-if="
+              deptBudgetList.outType == '汽运' ||
+              deptBudgetList.outType == '集装箱船'
+            "
+          >
+            <ws-input
+              v-model="deptBudgetList.boxNo"
+              placeholder="请输入箱号"
+              maxlength="20"
+              size="small"
+            />
+          </ws-form-item>
+          <ws-form-item
+            label="箱号-2"
+            span="1"
+            prop="boxNoOther"
+            v-if="
+              deptBudgetList.outType == '汽运' ||
+              deptBudgetList.outType == '集装箱船'
+            "
+          >
+            <ws-input
+              v-model="deptBudgetList.boxNoOther"
+              placeholder="请输入箱号"
+              maxlength="20"
+              size="small"
+            />
+          </ws-form-item>
+          <ws-form-item
+            label="封号-1"
+            span="1"
+            prop="titleNo"
+            v-if="
+              deptBudgetList.outType == '汽运' ||
+              deptBudgetList.outType == '集装箱船'
+            "
+          >
+            <ws-input
+              v-model="deptBudgetList.titleNo"
+              placeholder="请输入封号"
+              maxlength="20"
+              size="small"
+            />
+          </ws-form-item>
+          <ws-form-item
+            label="封号-2"
+            span="1"
+            prop="titleNoOther"
+            v-if="
+              deptBudgetList.outType == '汽运' ||
+              deptBudgetList.outType == '集装箱船'
+            "
+          >
+            <ws-input
+              v-model="deptBudgetList.titleNoOther"
+              placeholder="请输入封号"
+              maxlength="20"
+              size="small"
+            />
+          </ws-form-item>
+          <ws-form-item
+            label="车厢号-1"
+            span="1"
+            prop="wingNumber"
+            v-if="deptBudgetList.outType == '火运'"
+          >
+            <ws-input
+              v-model="deptBudgetList.wingNumber"
+              placeholder="请输入车厢号"
+              maxlength="20"
+              size="small"
+            />
+          </ws-form-item>
+          <ws-form-item
+            label="车厢号-2"
+            span="1"
+            prop="wingNumberOther"
+            v-if="deptBudgetList.outType == '火运'"
+          >
+            <ws-input
+              v-model="deptBudgetList.wingNumberOther"
+              placeholder="请输入车厢号"
+              maxlength="20"
+              size="small"
+            />
+          </ws-form-item>
+          <ws-form-item
+            label="船名"
+            span="1"
+            prop="shipName"
+            v-if="deptBudgetList.outType == '散船'"
+          >
+            <ws-input
+              v-model="deptBudgetList.shipName"
+              placeholder="请输入船名"
+              maxlength="20"
+              size="small"
+            />
+          </ws-form-item>
+          <ws-form-item
+            label="航次"
+            span="1"
+            prop="shipNumber"
+            v-if="deptBudgetList.outType == '散船'"
+          >
+            <ws-input
+              v-model="deptBudgetList.shipNumber"
+              placeholder="请输入航次"
+              maxlength="20"
+              size="small"
+            />
+          </ws-form-item>
+        </ws-info-table> -->
+        </div>
         <ws-info-table>
           <!--任务编号-->
           <ws-form-item label="任务编号" span="1" prop="inOutTaskNo">
@@ -159,7 +585,6 @@
               >重新获取</el-button
             >
           </ws-form-item>
-          <!--净重（公斤）-->
           <ws-form-item label="净重（公斤）" span="1" prop="netWeight">
             <ws-input
               disabled
@@ -992,6 +1417,11 @@ export default {
         ) {
           this.weightbills.goodsName=this.outContractNo[i].goodsName
           this.deptBudgetList.goodsName = this.outContractNo[i].goodsName
+          if(this.deptBudgetList.goodsName=='玉米（潮粮）'){
+            this.deptBudgetList.type='潮粮'
+          }else{
+            this.deptBudgetList.type='干粮'
+          }
           this.deptBudgetList.goodsNameKey = this.outContractNo[i].goodsNameKey
           this.deptBudgetList.grade = this.outContractNo[i].grade
           this.deptBudgetList.inOutType = this.outContractNo[i].inOutType
@@ -2125,6 +2555,7 @@ export default {
   }
 
   .el-form-item {
+    // width: 50%;
     width: 33.3333%;
     border: none;