前端孟祥旭

src/views/warehouse/warehouseManagementList.vue

@@ -258,7 +258,7 @@ export default {
     handleEdit() {
       this.$router.push({ path: 'warehouseManagementEdit' })
     },
-    handleDelete() {},
+  
   //   handlePut(){
   //     this.$router.push({ path: 'warehouseManagementPut' })
   //   },
@@ -266,7 +266,6 @@ export default {
   //     this.$router.push({ path: 'warehouseManagementDelivery' })
   //  },
 
-    handleEdit() {},
     handleDelete() {
        this.$router.push({ path: 'warehouseManagementDelete' })
     },

src/views/warehouse/warehouseManagementPut.vue

@@ -3,7 +3,7 @@
   <div class="container">
     <el-row>
       <el-col :span="20">
-        <h2 class="bg-left title">盘损当期仓损</h2>
+        <h2 class="bg-left title">入库登记</h2>
       </el-col>
       <el-col :span="4" class="bg-right">
         <el-button
@@ -16,12 +16,11 @@
       </el-col>
     </el-row>
     <div class="center">
-      <h2>鲅鱼圈一号库  102仓位</h2>
+      <h2>鲅鱼圈一号库 102仓位</h2>
       <ws-form ref="deptBudgetList" :model="deptBudgetList">
         <!-- 货名 -->
-        <ws-form-item label="货名" span="1"  class="readonly">
+        <ws-form-item label="货名" span="1" class="readonly">
           <ws-select
-           
             placeholder=""
             class="typeselect"
             @change="selectpackingMethod"
@@ -34,77 +33,204 @@
             />
           </ws-select>
         </ws-form-item>
-        <!--当期累计入库量-->
-        <ws-form-item label="当期累计入库量（吨）" span="1" prop="shippingType">
+        <!--毛重（吨）-->
+        <ws-form-item label="毛重（吨）" span="1" prop="shippingType">
           <ws-input
             v-model="deptBudgetList.shippingType"
-            placeholder="当期累计入库量（吨）"
+            placeholder="请输入毛重"
             maxlength="20"
             size="small"
           />
         </ws-form-item>
 
-        <!--当期累计出库量（吨）-->
-        <ws-form-item
-          label="当期累计出库量（吨）"
-          span="1"
-          prop="buyer"
-          class="readonly"
-        >
+        <!--皮重（吨）-->
+        <ws-form-item label="皮重（吨）" span="1" prop="buyer" class="readonly">
           <ws-input
             v-model="deptBudgetList.buyer"
-            placeholder="当期累计出库量（吨）"
+            placeholder="请输入皮重"
             maxlength="100"
             size="small"
           />
         </ws-form-item>
 
-        <!--应余库存（吨）-->
-        <ws-form-item label="应余库存（吨）" span="1" prop="settlementMethod">
+        <!--净重（吨）-->
+        <ws-form-item label="净重（吨）" span="1" prop="settlementMethod">
           <ws-input
             v-model="deptBudgetList.settlementMethod"
-            placeholder="应余库存（吨）"
+            placeholder="不可编辑，自动计算"
             maxlength="120"
             size="small"
           />
         </ws-form-item>
+        <!-- 品级 -->
+        <ws-form-item label="品级" span="1" class="readonly">
+          <ws-select
+            placeholder=""
+            class="typeselect"
+            @change="selectpackingMethod"
+          >
+            <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="seller"
-          class="readonly"
-        >
+        <!--经办人-->
+        <ws-form-item label="经办人" span="1" prop="seller" class="readonly">
           <ws-input
             v-model="deptBudgetList.seller"
-            placeholder="实际库存（吨）"
+            placeholder="请输入出库经办人姓名"
             maxlength="100"
             size="small"
           />
         </ws-form-item>
+        <!--出库日期-->
+        <ws-form-item label="出库日期" span="1" prop="signingDate" class="deliverydate">
+          <ws-date-picker
+            v-model="deptBudgetList.signingDate"
+            type="date"
+            placeholder="请选择出库日期"
+            value-format="yyyy-MM-dd"
+          />
+        </ws-form-item>
+        <!-- 入库类型 -->
+        <ws-form-item label="入库类型" span="1" class="readonly">
+          <ws-select
+            placeholder=""
+            class="typeselect"
+            @change="selectpackingMethod"
+          >
+            <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="sourceGoods">
+        <!--车牌号-->
+        <ws-form-item label="车牌号" span="1" prop="sourceGoods">
           <ws-input
             v-model="deptBudgetList.sourceGoods"
-            placeholder="损耗量（吨）"
+            placeholder="请输入车牌号"
             maxlength="20"
             size="small"
           />
         </ws-form-item>
 
-        <!--库损比例-->
-        <ws-form-item label="库损比例" span="1" prop="contractNo">
+        <!--合同编号-->
+        <ws-form-item label="合同编号" span="1" prop="contractNo">
           <ws-input
             v-model.number="deptBudgetList.buyerPhone"
-            placeholder="库损比例"
+            placeholder="请输入合同编号"
             maxlength="100"
             size="small"
           />
         </ws-form-item>
-        <p>注：提交成功后，当期实际库存将作为下一期的初始库存。</p>
-      </ws-form>
+
+        <ws-upload
+          ref="upload"
+          table-name="maintain_work_order"
+          oss-key="mainPlan"
+          :comp-id="compId"
+          :appendix-ids="appendixIdsAdd"
+          :vesselId="deptBudgetList.addressUrl"
+          :size-limit="size"
+          @uploadSuccess="uploadSuccess"
+          @onChange="onChange"
+          accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
+        />
+      
+        <div class="choice">
+          <h2>化验数据（选填）</h2>
+          <ws-info-table>
+            <!--自检员-->
+            <ws-form-item label="自检员" span="1" prop="settlementMethod">
+              <ws-input
+                v-model="deptBudgetList.settlementMethod"
+                placeholder="请输入自检员姓名"
+                maxlength="120"
+                size="small"
+              />
+            </ws-form-item>
+
+            <!--水分（%）<=-->
+            <ws-form-item label="水分（%）<=" span="1" prop="settlementMethod">
+              <ws-input
+                v-model="deptBudgetList.settlementMethod"
+                placeholder="请输入水分占比"
+                maxlength="120"
+                size="small"
+              />
+            </ws-form-item>
+            <!--杂质（%）<=-->
+            <ws-form-item label="杂质（%）<=" span="1" prop="settlementMethod">
+              <ws-input
+                v-model="deptBudgetList.settlementMethod"
+                placeholder="请输入杂质占比"
+                maxlength="120"
+                size="small"
+              />
+            </ws-form-item>
+            <!--容重（克/升）>=-->
+            <ws-form-item
+              label="容重（克/升）>="
+              span="1"
+              prop="settlementMethod"
+            >
+              <ws-input
+                v-model="deptBudgetList.settlementMethod"
+                placeholder="请输入容重"
+                maxlength="120"
+                size="small"
+              />
+            </ws-form-item>
+            <!--霉变粒（%）<=-->
+            <ws-form-item
+              label="霉变粒（%）<="
+              span="1"
+              prop="settlementMethod"
+            >
+              <ws-input
+                v-model="deptBudgetList.settlementMethod"
+                placeholder="请输入霉变粒占比"
+                maxlength="120"
+                size="small"
+              />
+            </ws-form-item>
+            <!--热损伤（%）<=-->
+            <ws-form-item
+              label="热损伤（%）<="
+              span="1"
+              prop="settlementMethod"
+            >
+              <ws-input
+                v-model="deptBudgetList.settlementMethod"
+                placeholder="请输入热损伤占比"
+                maxlength="120"
+                size="small"
+              />
+            </ws-form-item>
+            <!--不完整粒（%）<=-->
+            <ws-form-item
+              label="不完整粒（%）<="
+              span="1"
+              prop="settlementMethod"
+            >
+              <ws-input
+                v-model="deptBudgetList.settlementMethod"
+                placeholder="请输入不完整粒占比"
+                maxlength="120"
+                size="small"
+              />
+            </ws-form-item>
+          </ws-info-table>
+        </div>
+      
 
       <div style="text-align: right; padding: 10px">
         <el-button
@@ -115,20 +241,18 @@
           >提交</el-button
         >
       </div>
-    </div>
+      
+      </ws-form>
+    </div> 
   </div>
 </template>
 <script>
-import {
-  getList,
-  export1,
-  editstatus,
-  billoperatehis,
-} from '@/model/contarct/index'
+import { getList, export1, billoperatehis } from '@/model/contarct/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
-import { dayjs, fmoney, EventBus } from 'base-core-lib'
+// import { dayjs, fmoney, EventBus } from 'base-core-lib'
+import { dayjs, EventBus } from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
   components: {
@@ -164,9 +288,15 @@ export default {
       contractType: 2,
       startDate: null,
       endDate: null,
+      goodnameList:{},
       // 提交类型
       submitType: true,
-      selectpackingMethod: {},
+      selectpackingMethod:{},
+
+      appendixIdsAdd:{},
+      uploadSuccess:{},
+      onChange:{},
+
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
@@ -200,7 +330,7 @@ export default {
       this.$router.push({ path: 'warehouseManagementList' })
     },
     //提交按钮
-    submit(){
+    submit() {
       this.$router.push({ path: 'warehouseManagementList' })
     },
     dateFormat(fmt, date) {
@@ -349,16 +479,15 @@ export default {
 <style lang="scss" scoped>
 .center {
   position: relative;
-  margin-top: 100px;
-  top: 100px;
+  top: 50px;
   width: 40%;
-  height: 700px;
-  margin: 0 auto; 
+  height: 2000px;
+  margin: 0 auto;
 }
 /deep/.el-form-item__label {
-    width: 160px;
+  width: 160px;
 }
-/deep/.el-input--small{
+/deep/.el-input--small {
   width: 70%;
 }
 .container .bg-bottom {
@@ -367,4 +496,21 @@ export default {
   top: 15px;
   right: 20px;
 }
+//选填
+/deep/.el-form-item{
+  width: 50%;
+}
+.container {
+  overflow: scroll;
+  height: 120vh;
+}
+/deep/.ws-info-table[data-v-850a44a6] .el-form-item .el-form-item__label{
+  text-align: center;
+}
+.deliverydate{
+  width: 35%;
+}
+.center[data-v-32a9842f]{
+  margin-top: -60px;
+}
 </style>