前端gjy

src/views/warehouse/warehouseManagementDelivery.vue

@@ -15,13 +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>
         </h2>
-        <div class="small-title">基本信息</div>
         <ws-info-table>
           <!-- 货名 -->
           <ws-form-item label="货名" span="1">
@@ -34,8 +34,8 @@
               <ws-option
                 v-for="item in goodnameList"
                 :key="item.constKey"
-                :label="item.goodsName"
-                :value="item.goodsName"
+                :label="item.constValue"
+                :value="item.constValue"
               />
             </ws-select>
           </ws-form-item>
@@ -49,6 +49,7 @@
               size="small"
             />
           </ws-form-item>
+
           <!--皮重（吨）-->
           <ws-form-item
             label="皮重（吨）"
@@ -64,6 +65,7 @@
               size="small"
             />
           </ws-form-item>
+
           <!--净重（吨）-->
           <ws-form-item label="净重（吨）" span="1" prop="netWeight">
             <ws-input
@@ -91,6 +93,7 @@
               />
             </ws-select>
           </ws-form-item>
+
           <!--经办人-->
           <ws-form-item label="经办人" span="1" prop="agent">
             <ws-input
@@ -130,6 +133,7 @@
               />
             </ws-select>
           </ws-form-item>
+
           <!--车牌号-->
           <ws-form-item label="车牌号" span="1" prop="sourceGoods">
             <ws-input
@@ -139,6 +143,7 @@
               size="small"
             />
           </ws-form-item>
+
           <!--合同编号-->
           <ws-form-item label="合同编号" span="1" prop="contractNo">
             <ws-input
@@ -150,7 +155,6 @@
           </ws-form-item>
         </ws-info-table>
       </div>
-      <div class="small-title">上传仓库照片</div>
       <ws-upload
         ref="upload"
         table-name="maintain_work_order"
@@ -163,7 +167,7 @@
         @onChange="onChange"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
       />
-      <div class="small-title">化验数据（选填）</div>
+      <h2>化验数据（选填）</h2>
       <div class="inspector">
         <!--自检员-->
         <ws-form-item label="质检员" span="1" prop="qualityInspector">
@@ -175,64 +179,62 @@
           />
         </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>
+      <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 style="text-align: right; padding: 10px">
         <el-button
           class="bg-bottom-up"
@@ -253,7 +255,7 @@
   </div>
 </template>
 <script>
-import { pullDown, addstorageputList, goodsname } from '@/model/warehouse/index'
+import { pullDown, addstorageputList } from '@/model/warehouse/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -326,7 +328,6 @@ export default {
         warehouseInOutDetail: {},
       },
       historyList: [],
-
       pickerBeginDateBefore: {
         disabledDate: (time) => {
           return time.getTime() > Date.now()
@@ -380,136 +381,6 @@ export default {
     },
     //提交按钮
     submit() {
-      if (!this.deptBudgetList.goodsName) {
-        this.$message({
-          message: '货名不能为空！',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.deptBudgetList.grossWeight) {
-        this.$message({
-          message: '毛重不能为空！',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        isNaN(this.deptBudgetList.grossWeight) &&
-        this.deptBudgetList.grossWeight > 0 &&
-        this.deptBudgetList.grossWeight <= 10000
-      ) {
-        this.$message({
-          message: '毛重输入错误！',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.deptBudgetList.tare) {
-        this.$message({
-          message: '皮重不能为空！',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        isNaN(this.deptBudgetList.tare) &&
-        this.deptBudgetList.tare > 0 &&
-        this.deptBudgetList.tare <= 10000
-      ) {
-        this.$message({
-          message: '皮重输入错误！',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.deptBudgetList.netWeight) {
-        this.$message({
-          message: '净重不能为空！',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        isNaN(this.deptBudgetList.netWeight) &&
-        this.deptBudgetList.tare > 0 &&
-        this.deptBudgetList.tare <= 10000
-      ) {
-        this.$message({
-          message: '净重输入错误！',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.deptBudgetList.grade) {
-        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 != 7) {
-        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 > 20
-      ) {
-        this.$message({
-          message: '合同编号输入有误！',
-          type: 'warning',
-        })
-        return
-      }
       this.$refs.deptBudgetList.validate((valid) => {
         if (valid) {
           this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
@@ -577,7 +448,7 @@ export default {
     },
     getList() {
       // 货名
-      goodsname({ positionId: this.$route.query.positionId })
+      pullDown({ constId: 'CON2' })
         .toPromise()
         .then((response) => {
           this.goodnameList = response
@@ -636,29 +507,29 @@ export default {
         })
     },
 
-    // async exportlist() {
-    //   const { data } = await export1(
-    //     {
-    //       compId: sessionStorage.getItem('ws-pf_compId'),
-    //       contractType: this.contractType,
-    //       currentPage: this.currentPage,
-    //       pageSize: this.pageSize,
-    //       searchType: this.searchType,
-    //       searchKeyWord: this.searchKeyWord,
-    //       startDate: this.startDate,
-    //       endDate: this.endDate,
-    //     },
-    //     {},
-    //     { responseType: 'blob' }
-    //   ).toPromise()
-    //   downloadFile({
-    //     res: data,
-    //     fileName: `${
-    //       this.date.year + (this.date.month ? `-${this.date.month}` : '')
-    //     }_采购合同`,
-    //     type: 'xls',
-    //   })
-    // },
+    async exportlist() {
+      const { data } = await export1(
+        {
+          compId: sessionStorage.getItem('ws-pf_compId'),
+          contractType: this.contractType,
+          currentPage: this.currentPage,
+          pageSize: this.pageSize,
+          searchType: this.searchType,
+          searchKeyWord: this.searchKeyWord,
+          startDate: this.startDate,
+          endDate: this.endDate,
+        },
+        {},
+        { responseType: 'blob' }
+      ).toPromise()
+      downloadFile({
+        res: data,
+        fileName: `${
+          this.date.year + (this.date.month ? `-${this.date.month}` : '')
+        }_采购合同`,
+        type: 'xls',
+      })
+    },
     // deletecontract(){},
     //删除
     approve() {},
@@ -723,7 +594,9 @@ export default {
 /deep/.el-form-item__label {
   width: 160px;
 }
-
+/deep/.el-input--small {
+  width: 70%;
+}
 //选填
 /deep/.el-form-item {
   width: 50%;
@@ -756,11 +629,12 @@ export default {
 }
 //表格文字
 /deep/.ws-info-table .el-form-item .el-form-item__label {
-  text-align: center;
+  text-align: left;
   font-size: 14px;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #8890b1;
+  background: #f6f7fc;
   line-height: 16px;
 }
 //质检员
@@ -768,34 +642,4 @@ export default {
   text-align: left;
   margin-left: 0px;
 }
-.small-title {
-  position: relative;
-  padding: 10px;
-}
-.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: 120%;
-}
 </style>