Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/api/V2/warehouse/index.js

@@ -21,7 +21,6 @@ export const API_POST_WAREHOUSE_EDIT = '/warehouseBaseInfo/api/editWarehouse'
 export const API_GET_WAREHOUSE_IOSS = '/warehouseInventoryCountInfo/getInfo'
 //货名下拉
 export const API_GET_WAREHOUSE_NAME = '/warehousePositionStorageInfo/selectGoodsName'
-
 // 货名等下拉
 export const API_GET_CUSTOMDROPDOWN_CUSTOMDROPDOWN = `/commonSysParameter/getInfo`
 // 入库添加

src/views/warehouse/warehouseManagementDelivery.vue

@@ -15,16 +15,13 @@
         >
       </el-col>
     </el-row>
-
     <ws-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules">
       <div class="basicInformation">
         <h2>
           {{ deptBudgetList.warehouseName }}库
-           <span class="position">
-          {{deptBudgetList.binNumber }}仓位
-          </span>
+          <span class="position"> {{ deptBudgetList.binNumber }}仓位 </span>
         </h2>
-       <div class="small-title">基本信息</div>
+        <div class="small-title">基本信息</div>
         <ws-info-table>
           <!-- 货名 -->
           <ws-form-item label="货名" span="1">
@@ -37,8 +34,8 @@
               <ws-option
                 v-for="item in goodnameList"
                 :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
+                :label="item.goodsName"
+                :value="item.goodsName"
               />
             </ws-select>
           </ws-form-item>
@@ -52,7 +49,6 @@
               size="small"
             />
           </ws-form-item>
-
           <!--皮重（吨）-->
           <ws-form-item
             label="皮重（吨）"
@@ -68,7 +64,6 @@
               size="small"
             />
           </ws-form-item>
-
           <!--净重（吨）-->
           <ws-form-item label="净重（吨）" span="1" prop="netWeight">
             <ws-input
@@ -96,7 +91,6 @@
               />
             </ws-select>
           </ws-form-item>
-
           <!--经办人-->
           <ws-form-item label="经办人" span="1" prop="agent">
             <ws-input
@@ -107,7 +101,12 @@
             />
           </ws-form-item>
           <!--出库日期-->
-          <ws-form-item label="出库日期" span="1" prop="inOutDate" class="deliverydate">
+          <ws-form-item
+            label="出库日期"
+            span="1"
+            prop="inOutDate"
+            class="deliverydate"
+          >
             <ws-date-picker
               v-model="deptBudgetList.inOutDate"
               type="date"
@@ -131,7 +130,6 @@
               />
             </ws-select>
           </ws-form-item>
-
           <!--车牌号-->
           <ws-form-item label="车牌号" span="1" prop="sourceGoods">
             <ws-input
@@ -141,7 +139,6 @@
               size="small"
             />
           </ws-form-item>
-
           <!--合同编号-->
           <ws-form-item label="合同编号" span="1" prop="contractNo">
             <ws-input
@@ -153,7 +150,7 @@
           </ws-form-item>
         </ws-info-table>
       </div>
-       <div class="small-title">上传仓库照片</div>
+      <div class="small-title">上传仓库照片</div>
       <ws-upload
         ref="upload"
         table-name="maintain_work_order"
@@ -166,10 +163,10 @@
         @onChange="onChange"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
       />
-     <div class="small-title">化验数据（选填）</div>
+      <div class="small-title">化验数据（选填）</div>
       <div class="inspector">
-       <!--自检员-->
-        <ws-form-item label="质检员" span="1" prop="qualityInspector" >
+        <!--自检员-->
+        <ws-form-item label="质检员" span="1" prop="qualityInspector">
           <ws-input
             v-model="deptBudgetList.warehouseInOutDetail.qualityInspector"
             placeholder="请输入质检员姓名"
@@ -177,65 +174,64 @@
             size="small"
           />
         </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"
-            size="small"
-          />
-        </ws-form-item>
-        <!--杂质（%）<=-->
-        <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
-          <ws-input
-            v-model="deptBudgetList.warehouseInOutDetail.impurity"
-            placeholder="请输入杂质占比"
-            maxlength="120"
-            size="small"
-          />
-        </ws-form-item>
-        <!--容重（克/升）>=-->
-        <ws-form-item label="容重（克/升）>=" span="1" prop="bulkDensity">
-          <ws-input
-            v-model="deptBudgetList.warehouseInOutDetail.bulkDensity"
-            placeholder="请输入容重"
-            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"
-            size="small"
-          />
-        </ws-form-item>
-        <!--热损伤（%）<=-->
-        <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
-          <ws-input
-            v-model="deptBudgetList.warehouseInOutDetail.jiaorenli"
-            placeholder="请输入热损伤占比"
-            maxlength="120"
-            size="small"
-          />
-        </ws-form-item>
-        <!--不完整粒（%）<=-->
-        <ws-form-item label="不完整粒（%）<=" span="1" prop="imperfectGrain">
-          <ws-input
-            v-model="deptBudgetList.warehouseInOutDetail.imperfectGrain"
-            placeholder="请输入不完整粒占比"
-            maxlength="120"
-            size="small"
-          />
-        </ws-form-item>
-       
-      </ws-info-table>
+      </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"
+              size="small"
+            />
+          </ws-form-item>
+          <!--杂质（%）<=-->
+          <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
+            <ws-input
+              v-model="deptBudgetList.warehouseInOutDetail.impurity"
+              placeholder="请输入杂质占比"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
+          <!--容重（克/升）>=-->
+          <ws-form-item label="容重（克/升）>=" span="1" prop="bulkDensity">
+            <ws-input
+              v-model="deptBudgetList.warehouseInOutDetail.bulkDensity"
+              placeholder="请输入容重"
+              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"
+              size="small"
+            />
+          </ws-form-item>
+          <!--热损伤（%）<=-->
+          <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
+            <ws-input
+              v-model="deptBudgetList.warehouseInOutDetail.jiaorenli"
+              placeholder="请输入热损伤占比"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
+          <!--不完整粒（%）<=-->
+          <ws-form-item label="不完整粒（%）<=" span="1" prop="imperfectGrain">
+            <ws-input
+              v-model="deptBudgetList.warehouseInOutDetail.imperfectGrain"
+              placeholder="请输入不完整粒占比"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
+        </ws-info-table>
       </div>
       <div style="text-align: right; padding: 10px">
         <el-button
@@ -257,7 +253,7 @@
   </div>
 </template>
 <script>
-import { pullDown, addstorageputList } from '@/model/warehouse/index'
+import { pullDown, addstorageputList, goodsname } from '@/model/warehouse/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -391,14 +387,18 @@ export default {
         })
         return
       }
-       if (!this.deptBudgetList.grossWeight) {
+      if (!this.deptBudgetList.grossWeight) {
         this.$message({
           message: '毛重不能为空！',
           type: 'warning',
         })
         return
       }
-       if (isNaN(this.deptBudgetList.grossWeight) && this.deptBudgetList.grossWeight>0 && this.deptBudgetList.grossWeight <= 10000) {
+      if (
+        isNaN(this.deptBudgetList.grossWeight) &&
+        this.deptBudgetList.grossWeight > 0 &&
+        this.deptBudgetList.grossWeight <= 10000
+      ) {
         this.$message({
           message: '毛重输入错误！',
           type: 'warning',
@@ -412,49 +412,60 @@ export default {
         })
         return
       }
-      if (isNaN(this.deptBudgetList.tare) && this.deptBudgetList.tare>0 && this.deptBudgetList.tare <= 10000) {
+      if (
+        isNaN(this.deptBudgetList.tare) &&
+        this.deptBudgetList.tare > 0 &&
+        this.deptBudgetList.tare <= 10000
+      ) {
         this.$message({
           message: '皮重输入错误！',
           type: 'warning',
         })
         return
       }
-       if (!this.deptBudgetList.netWeight) {
+      if (!this.deptBudgetList.netWeight) {
         this.$message({
           message: '净重不能为空！',
           type: 'warning',
         })
         return
       }
-       if (isNaN(this.deptBudgetList.netWeight) && this.deptBudgetList.tare>0 && this.deptBudgetList.tare <= 10000) {
+      if (
+        isNaN(this.deptBudgetList.netWeight) &&
+        this.deptBudgetList.tare > 0 &&
+        this.deptBudgetList.tare <= 10000
+      ) {
         this.$message({
           message: '净重输入错误！',
           type: 'warning',
         })
         return
-      }  
-       if (!this.deptBudgetList.grade) {
+      }
+      if (!this.deptBudgetList.grade) {
         this.$message({
           message: '品级不能为空！',
           type: 'warning',
         })
         return
       }
-        if (!this.deptBudgetList.agent) {
+      if (!this.deptBudgetList.agent) {
         this.$message({
           message: '经办人不能为空！',
           type: 'warning',
         })
         return
       }
-       if (this.deptBudgetList.agent.length < 2 && this.deptBudgetList.agent.length > 10) {
+      if (
+        this.deptBudgetList.agent.length < 2 &&
+        this.deptBudgetList.agent.length > 10
+      ) {
         this.$message({
           message: '经办人姓名输入有误！',
           type: 'warning',
         })
         return
       }
-       if (!this.deptBudgetList.inOutDate) {
+      if (!this.deptBudgetList.inOutDate) {
         this.$message({
           message: '出库日期不能为空！',
           type: 'warning',
@@ -475,29 +486,30 @@ export default {
         })
         return
       }
-       if (this.deptBudgetList.carNo.length != 7) {
+      if (this.deptBudgetList.carNo.length != 7) {
         this.$message({
           message: '车牌号输入有误！',
           type: 'warning',
         })
         return
       }
-       if (!this.deptBudgetList.contractNo) {
+      if (!this.deptBudgetList.contractNo) {
         this.$message({
           message: '合同编号不能为空！',
           type: 'warning',
         })
         return
       }
-       if (this.deptBudgetList.contractNo.length < 6 && this.deptBudgetList.contractNo.length > 20) {
+      if (
+        this.deptBudgetList.contractNo.length < 6 &&
+        this.deptBudgetList.contractNo.length > 20
+      ) {
         this.$message({
           message: '合同编号输入有误！',
           type: 'warning',
         })
         return
       }
-
-
       this.$refs.deptBudgetList.validate((valid) => {
         if (valid) {
           this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
@@ -565,7 +577,7 @@ export default {
     },
     getList() {
       // 货名
-      pullDown({ constId: 'CON2' })
+      goodsname({ positionId: this.$route.query.positionId })
         .toPromise()
         .then((response) => {
           this.goodnameList = response
@@ -729,30 +741,30 @@ export default {
 }
 .center {
   margin-top: -60px;
-    width: 80%;
+  width: 80%;
 }
 //仓位
-.position{
- width: 52px;
-height: 20px;
-background: #AFB5CB;
-border-radius: 2px;
-font-size: 12px;
-font-family: PingFangSC-Medium, PingFang SC;
-color: #FFFFFF;
-line-height: 20px;
+.position {
+  width: 52px;
+  height: 20px;
+  background: #afb5cb;
+  border-radius: 2px;
+  font-size: 12px;
+  font-family: PingFangSC-Medium, PingFang SC;
+  color: #ffffff;
+  line-height: 20px;
 }
 //表格文字
-/deep/.ws-info-table .el-form-item .el-form-item__label{
+/deep/.ws-info-table .el-form-item .el-form-item__label {
   text-align: left;
-font-size: 14px;
-font-family: PingFangSC-Regular, PingFang SC;
-font-weight: 400;
-color: #8890B1;
-line-height: 16px;
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
 }
 //质检员
-.inspector .el-form-item__content{
+.inspector .el-form-item__content {
   text-align: left;
   margin-left: 0px;
 }
@@ -771,19 +783,19 @@ line-height: 16px;
   top: 13px;
 }
 //下面列表
-.neifor{
+.neifor {
   width: 80%;
-  background-color: #F6F7FC;
+  background-color: #f6f7fc;
 }
-/deep/.neifor .ws-info-table .el-form-item .el-form-item__label{
+/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{
+/deep/.neifor .ws-info-table .el-form-item .el-form-item__content {
   width: 60%;
-  background-color: #F6F7FC;
+  background-color: #f6f7fc;
 }
-/deep/.neifor .el-input--small .el-input__inner{
+/deep/.neifor .el-input--small .el-input__inner {
   width: 120%;
 }
 </style>