zhongtianhaoyuan пре 4 година
родитељ
комит
b0c58686f4

+ 1 - 0
src/api/V2/warehouse/index.js

@@ -0,0 +1 @@
+export const API_GET_WAREHOUSE_BASEINFO = '/warehouseBaseInfo/selectWarehouseViewinfo'

+ 7 - 0
src/model/warehouse/index.js

@@ -0,0 +1,7 @@
+import { errorCatcher, errorHandle, filter } from 'base-core-lib'
+import { appRx } from '../defalutConfig/indexRx'
+import {
+    API_GET_WAREHOUSE_BASEINFO,
+} from '@/api/V2/warehouse'
+// 列表
+export const getList = appRx.get(API_GET_WAREHOUSE_BASEINFO, errorCatcher, errorHandle, filter)

+ 1 - 1
src/views/contractManagement/purchaseContract.vue

@@ -527,7 +527,7 @@ export default {
       console.log(row)
       this.$router.push({
         name: 'purchaseContractExamine',
-        query: { id: row.id, status: row.status, con },
+        query: { id: row.id, status: row.status },
       })
     },
     handleAdd() {

+ 7 - 4
src/views/contractManagement/purchaseContractAdd.vue

@@ -103,6 +103,7 @@
         <ws-form-item label="买方电话" span="1" prop="contractNo">
           <ws-input
             v-model.number="deptBudgetList.buyerPhone"
+            placeholder="请输入买方电话"
             maxlength="100"
             size="small"
           />
@@ -613,12 +614,14 @@ export default {
     //cg.viewBudget
     //cg.viewSpareMoney
     // this.getVesselData();
-    this.deptBudgetList.packingMethod = '装'
-    this.deptBudgetList.packingMethodKey = 2
+    this.deptBudgetList.packingMethod = '装'
+    this.deptBudgetList.packingMethodKey = 1
     this.deptBudgetList.contractGoodsInfo.goodsName = '玉米'
     this.deptBudgetList.contractGoodsInfo.goodsNameKey = 1
     this.deptBudgetList.contractProcessInfo.grade = '未回收'
     this.deptBudgetList.contractProcessInfo.gradeKey = 1
+    this.deptBudgetList.contractGoodsInfo.grade = '一等品'
+    this.deptBudgetList.contractGoodsInfo.gradeKey = 1
     this.loaddata()
     this.showType = this.isShow
   },
@@ -1391,7 +1394,7 @@ export default {
   margin: 15px 0px;
 }
 .wenzi {
-  width: 900px;
+  width: 70%;
   margin: 0 auto;
 }
 .wenzi h3 {
@@ -1402,7 +1405,7 @@ export default {
   display: inline-block;
 }
 .center {
-  width: 900px;
+  width: 70%;
   margin: 0 auto;
 }
 .el-form-item {

+ 84 - 62
src/views/contractManagement/purchaseContractEdit.vue

@@ -151,44 +151,75 @@
               placeholder="请输入重量(吨)"
             />
           </ws-form-item>
-          <ws-form-item
-            label="验收方式"
-            span="1"
-            prop="acceptanceMethod">
-             <el-select v-model="deptBudgetList.acceptanceMethod" :value='deptBudgetList.acceptanceMethod' placeholder="请选择验收方式"  style="width: 100%;" filterable @change="selectunitList">
-              <el-option v-for="(item,index) in unitList"
-               :key="item.constValue"
-               :label=" item.constValue"
-               :value="item.constValue">
-                <span class="unit-left" style="float: left">
-                  <span v-if="item.flag == 'delete'"> {{ item.constValue }}</span>
-                  <!-- 新增文本框 -->
-                  <div style="width:160px" v-if="item.flag !== 'delete'" @click.stop>
-                    <ws-input v-model="item.constValue"
+          <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
+          <el-select
+            v-model="deptBudgetList.acceptanceMethod"
+            placeholder="请选择验收方式"
+            style="width: 100%"
+            filterable
+            @change="selectunitList"
+          >
+            <el-option
+              v-for="(item, index) in unitList"
+              :key="item.constValue"
+              :label="item.constValue"
+              :value="item.constValue"
+            >
+              <span class="unit-left" style="float: left">
+                <span v-if="item.flag == 'delete'"> {{ item.constValue }}</span>
+                <!-- 新增文本框 -->
+                <div
+
+                  v-if="item.flag !== 'delete'"
+                  @click.stop
+                >
+                  <ws-input
+                    v-model="item.constValue"
                     clearable
                     maxlength="10"
-                    style="width:100%;"></ws-input>
-                  </div>
-                </span>
-                <span style="float: right; color: #8492a6; font-size: 13px">
-                  <!-- 对号 -->
-                  <i class="el-icon-check" style="line-height: 29px;margin-left:10px" v-if="item.flag !== 'delete'" @click.stop="saveClick(item, index)"></i>
-                  <!-- 编辑 -->
-                  <i class="el-icon-edit" style="line-height: 29px;margin-left:10px" v-if="item.flag == 'delete'" @click.stop="editClick(item, index)"></i>
-                  <!-- 删除 -->
-                  <i class="el-icon-delete" style="line-height: 29px;" @click.stop="deleteClick(item, index)"></i>
-                </span>
-              </el-option>
-              <!-- 新增按钮 -->
-              <el-option value="" label="">
-                <div style="text-align: right;
-    border-top: 1px solid #DCDFE6;
-    padding: 5px;">
-                  <ws-button type="primary" @click.stop="addClick">{{$t('button.add')}}</ws-button>
+                    style="width: 200px"
+                  ></ws-input>
                 </div>
-              </el-option>
-              </el-select>
-          </ws-form-item>
+              </span>
+              <span style="float: right; color: #8492a6; font-size: 13px">
+                <!-- 对号 -->
+                <i
+                  class="el-icon-check"
+                  style="line-height: 29px; margin-left: 10px"
+                  v-if="item.flag !== 'delete'"
+                  @click.stop="saveClick(item, index)"
+                ></i>
+                <!-- 编辑 -->
+                <i
+                  class="el-icon-edit"
+                  style="line-height: 29px; margin-left: 10px"
+                  v-if="item.flag == 'delete'"
+                  @click.stop="editClick(item, index)"
+                ></i>
+                <!-- 删除 -->
+                <i
+                  class="el-icon-delete"
+                  style="line-height: 29px"
+                  @click.stop="deleteClick(item, index)"
+                ></i>
+              </span>
+            </el-option>
+            <!-- 新增按钮 -->
+            <el-option value="" label="">
+              <div
+                style="
+                  text-align: right;
+                  border-top: 1px solid #dcdfe6;
+                  padding: 5px;
+                "
+              >
+                <ws-button type="primary" @click.stop="addClick">{{
+                  $t('button.add')
+                }}</ws-button>
+              </div>
+            </el-option>
+          </el-select>
+        </ws-form-item>
           <ws-form-item
             label="溢短装(%)"
             span="1"
@@ -204,15 +235,12 @@
             label="交货日期(起)"
             span="1"
             prop="deliveryDateStart">
-            <ws-date-picker
-          :picker-options="pickerBeginDateBefore"
-          v-model="deptBudgetList.deliveryDateStart"
-          type="date"
-          default-value="1980-01-01"
-          placeholder="请选择交货日期(起)"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-        />
+         <ws-date-picker
+            v-model="deptBudgetList.deliveryDateStart"
+            type="date"
+            placeholder="请选择交货日期(起)"
+            value-format="yyyy-MM-dd"
+          />
           </ws-form-item>
           <ws-form-item class='readonly'
             label="合同单价(元/吨)"
@@ -226,15 +254,12 @@
             label="交货日期(止)"
             span="1"
             prop="deliveryDateEnd">
-           <ws-date-picker
-          :picker-options="pickerBeginDateBefore"
-          v-model="deptBudgetList.deliveryDateEnd"
-          type="date"
-          default-value="1980-01-01"
-          placeholder="请选择交货日期(止)"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-        />
+            <ws-date-picker
+            v-model="deptBudgetList.deliveryDateEnd"
+            type="date"
+            placeholder="请选择交货日期(止)"
+            value-format="yyyy-MM-dd"
+          />
           </ws-form-item>
           <ws-form-item
             label="合同总价(元)"
@@ -251,15 +276,12 @@
             label="签订日期"
             span="1"
             prop="signingDate">
-            <ws-date-picker
-          :picker-options="pickerBeginDateBefore"
-          v-model="deptBudgetList.deliveryDateEnd"
-          type="date"
-          default-value="1980-01-01"
-          placeholder="请选择合同签订日期"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-        />
+        <ws-date-picker
+            v-model="deptBudgetList.signingDate"
+            type="date"
+            placeholder="请选择合同签订日期"
+            value-format="yyyy-MM-dd"
+          />
           </ws-form-item>
         </ws-info-table>
       </base-card>

+ 21 - 4
src/views/contractManagement/salesContract.vue

@@ -129,9 +129,16 @@
       <el-table-column prop="seller" label="卖方"> </el-table-column>
       <el-table-column prop="imperfectGrain" label="已完成(吨)">
         <template slot-scope="scope">
-          <span style="color: #5473e8; font-weight: 600">{{
-            scope.row.imperfectGrain
-          }}</span>
+          <span
+            v-if="scope.row.proportion < 90"
+            style="color: #5473e8; font-weight: 600"
+            >{{ scope.row.imperfectGrain }}</span
+          >
+          <span
+            v-if="scope.row.proportion > 90"
+            style="color: red; font-weight: 600"
+            >{{ scope.row.imperfectGrain }}</span
+          >
         </template>
       </el-table-column>
       <el-table-column prop="status" label="状态">
@@ -317,7 +324,7 @@ export default {
       searchType: 1,
       searchTypeText: '未完成',
       searchKeyWord: '',
-      contractType: 2,
+      contractType: 1,
       startDate: null,
       endDate: null,
       // 提交类型
@@ -462,6 +469,16 @@ export default {
             } else {
               response.records[i].addressUrlArray = []
             }
+            if (response.records[i].imperfectGrain != null) {
+              response.records[i].proportion =
+                Math.floor(
+                  (response.records[i].imperfectGrain /
+                    response.records[i].weight) *
+                    10000
+                ) / 100
+            } else {
+              response.records[i].proportion = 0
+            }
           }
           this.deptCircularPage.currentPage = response.current
           this.deptCircularPage.pageSize = response.size

+ 11 - 20
src/views/contractManagement/salesContractAdd.vue

@@ -97,6 +97,7 @@
           <ws-form-item label="买方电话" span="1" prop="contractNo">
             <ws-input
               v-model.number="deptBudgetList.buyerPhone"
+              placeholder="请输入买方电话"
               maxlength="100"
               size="small"
             />
@@ -238,12 +239,9 @@
             prop="deliveryDateStart"
           >
             <ws-date-picker
-              :picker-options="pickerBeginDateBefore"
               v-model="deptBudgetList.deliveryDateStart"
               type="date"
-              default-value="1980-01-01"
-              placeholder="起始日期"
-              format="yyyy-MM-dd"
+              placeholder="请选择交货日期(起)"
               value-format="yyyy-MM-dd"
             />
           </ws-form-item>
@@ -266,12 +264,9 @@
           <!--交货日期(止)-->
           <ws-form-item label="交货日期(止)" span="1" prop="deliveryDateEnd">
             <ws-date-picker
-              :picker-options="pickerBeginDateBefore"
               v-model="deptBudgetList.deliveryDateEnd"
               type="date"
-              default-value="1980-01-01"
-              placeholder="起始日期"
-              format="yyyy-MM-dd"
+              placeholder="请选择交货日期(止)"
               value-format="yyyy-MM-dd"
             />
           </ws-form-item>
@@ -289,12 +284,9 @@
           <!--签订日期-->
           <ws-form-item label="签订日期" span="1" prop="signingDate">
             <ws-date-picker
-              :picker-options="pickerBeginDateBefore"
               v-model="deptBudgetList.signingDate"
               type="date"
-              default-value="1980-01-01"
-              placeholder="起始日期"
-              format="yyyy-MM-dd"
+              placeholder="请选择合同签订日期"
               value-format="yyyy-MM-dd"
             />
           </ws-form-item>
@@ -642,12 +634,14 @@ export default {
     //cg.viewBudget
     //cg.viewSpareMoney
     // this.getVesselData();
-    this.deptBudgetList.packingMethod = '装'
-    this.deptBudgetList.packingMethodKey = 2
+    this.deptBudgetList.packingMethod = '装'
+    this.deptBudgetList.packingMethodKey = 1
     this.deptBudgetList.contractGoodsInfo.goodsName = '玉米'
     this.deptBudgetList.contractGoodsInfo.goodsNameKey = 1
     this.deptBudgetList.contractProcessInfo.grade = '未回收'
     this.deptBudgetList.contractProcessInfo.gradeKey = 1
+    this.deptBudgetList.contractGoodsInfo.grade = '一等品'
+    this.deptBudgetList.contractGoodsInfo.gradeKey = 1
     this.loaddata()
     this.showType = this.isShow
   },
@@ -1440,7 +1434,7 @@ export default {
   margin: 16px 0px;
 }
 .wenzi {
-  width: 900px;
+  width: 70%;
   margin: 0 auto;
 }
 .wenzi h3 {
@@ -1451,7 +1445,7 @@ export default {
   display: inline-block;
 }
 .center {
-  width: 900px;
+  width: 70%;
   margin: 0 auto;
 }
 .el-form-item {
@@ -1461,7 +1455,7 @@ export default {
   text-align: center;
 }
 .ce {
-  width: 900px;
+  width: 70%;
   margin: 0 auto;
 }
 /*.crt-main .textarea /deep/ .el-form-item__label {*/
@@ -1522,8 +1516,6 @@ export default {
 /deep/.el-input,
 /deep/.el-date-editor {
   font-size: 13px;
-  width: 232px;
-  left: 21px;
 }
 /deep/.el-textarea {
   width: 900px;
@@ -1546,7 +1538,6 @@ export default {
 /deep/.el-input--small .el-input__inner {
   height: 32px;
   line-height: 32px;
-  width: 232px;
 }
 // 控制select为只读的时候显示样式
 /deep/.ws-class-table-col {

+ 224 - 234
src/views/contractManagement/salesContractEdit.vue

@@ -197,7 +197,13 @@
               </el-option>
               <!-- 新增按钮 -->
               <el-option value="" label="">
-                <div style="text-align: center">
+                <div
+                  style="
+                    text-align: right;
+                    border-top: 1px solid #dcdfe6;
+                    padding: 5px;
+                  "
+                >
                   <ws-button type="primary" @click.stop="addClick">{{
                     $t('button.add')
                   }}</ws-button>
@@ -222,12 +228,9 @@
             prop="deliveryDateStart"
           >
             <ws-date-picker
-              :picker-options="pickerBeginDateBefore"
               v-model="deptBudgetList.deliveryDateStart"
               type="date"
-              default-value="1980-01-01"
-              placeholder="起始日期"
-              format="yyyy-MM-dd"
+              placeholder="请选择交货日期(起)"
               value-format="yyyy-MM-dd"
             />
           </ws-form-item>
@@ -243,12 +246,9 @@
           <!--交货日期(止)-->
           <ws-form-item label="交货日期(止)" span="1" prop="deliveryDateEnd">
             <ws-date-picker
-              :picker-options="pickerBeginDateBefore"
               v-model="deptBudgetList.deliveryDateEnd"
               type="date"
-              default-value="1980-01-01"
-              placeholder="起始日期"
-              format="yyyy-MM-dd"
+              placeholder="请选择交货日期(止)"
               value-format="yyyy-MM-dd"
             />
           </ws-form-item>
@@ -265,32 +265,30 @@
           <!--签订日期-->
           <ws-form-item label="签订日期" span="1" prop="signingDate">
             <ws-date-picker
-              :picker-options="pickerBeginDateBefore"
               v-model="deptBudgetList.signingDate"
               type="date"
-              default-value="1980-01-01"
-              placeholder="起始日期"
-              format="yyyy-MM-dd"
+              placeholder="请选择合同签订日期"
               value-format="yyyy-MM-dd"
             />
           </ws-form-item>
         </ws-info-table>
       </ws-form>
-      <!-- <base-card> -->
-      <div class="wenzi">
-        <h3>货物信息</h3>
-      </div>
-      <div class="center">
-        <ws-form
-          ref="deptBudgetList"
-          :rules="ruleDeptBudget"
-          :model="deptBudgetList"
-        >
-          <!--货物信息-->
-          <ws-info-table>
-            <!--货名-->
-            <ws-form-item label="货名" span="1" prop="goodsName">
-              <!-- <ws-select
+    </div>
+    <!-- <base-card> -->
+    <div class="wenzi">
+      <h3>货物信息</h3>
+    </div>
+    <div class="center">
+      <ws-form
+        ref="deptBudgetList"
+        :rules="ruleDeptBudget"
+        :model="deptBudgetList"
+      >
+        <!--货物信息-->
+        <ws-info-table>
+          <!--货名-->
+          <ws-form-item label="货名" span="1" prop="goodsName">
+            <!-- <ws-select
                 v-model="deptBudgetList.contractGoodsInfo.goodsName"
                 placeholder=""
                 class="typeselect"
@@ -303,220 +301,215 @@
                   :value="item.constValue"
                 />
               </ws-select> -->
-              <div class="unchanged">
-                {{ deptBudgetList.contractGoodsInfo.goodsName }}
-              </div>
-              <span class="unchangeable">*</span>
-            </ws-form-item>
-
-            <!--水分(%)<=-->
-            <ws-form-item label="水分(%)" span="1" prop="contractNo">
-              <ws-input
-                v-model="deptBudgetList.contractGoodsInfo.waterContent"
-                placeholder="请输入水分(%)"
-                maxlength="100"
-                size="small"
-              />
-            </ws-form-item>
+            <div class="unchanged">
+              {{ deptBudgetList.contractGoodsInfo.goodsName }}
+            </div>
+            <span class="unchangeable">*</span>
+          </ws-form-item>
 
-            <!--品级-->
-            <ws-form-item label="品级" span="1" prop="grade">
-              <ws-select
-                v-model="deptBudgetList.contractGoodsInfo.grade"
-                placeholder=""
-                class="typeselect"
-                @change="selectgrade"
-              >
-                <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="contractNo">
+            <ws-input
+              v-model="deptBudgetList.contractGoodsInfo.waterContent"
+              placeholder="请输入水分(%)"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
 
-            <!--杂质(%)<=-->
-            <ws-form-item label="杂质(%)" span="1" prop="contractNo">
-              <ws-input
-                v-model="deptBudgetList.contractGoodsInfo.impurity"
-                placeholder="请输入杂质(%)"
-                maxlength="100"
-                size="small"
+          <!--品级-->
+          <ws-form-item label="品级" span="1" prop="grade">
+            <ws-select
+              v-model="deptBudgetList.contractGoodsInfo.grade"
+              placeholder=""
+              class="typeselect"
+              @change="selectgrade"
+            >
+              <ws-option
+                v-for="item in gradeList"
+                :key="item.constKey"
+                :label="item.constValue"
+                :value="item.constValue"
               />
-            </ws-form-item>
+            </ws-select>
+          </ws-form-item>
 
-            <!--容量(克/升)>=-->
-            <ws-form-item label="容量(克/升)" span="1" prop="contractNo">
-              <ws-input
-                v-model="deptBudgetList.contractGoodsInfo.bulkDensity"
-                placeholder="请输入容量(克/升)"
-                maxlength="100"
-                size="small"
-              />
-            </ws-form-item>
+          <!--杂质(%)<=-->
+          <ws-form-item label="杂质(%)" span="1" prop="contractNo">
+            <ws-input
+              v-model="deptBudgetList.contractGoodsInfo.impurity"
+              placeholder="请输入杂质(%)"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
 
-            <!--霉变粒(%)<=-->
-            <ws-form-item label="霉变粒(%)" span="1" prop="contractNo">
-              <ws-input
-                v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
-                placeholder="请输入霉变粒(%)"
-                maxlength="100"
-                size="small"
-              />
-            </ws-form-item>
+          <!--容量(克/升)>=-->
+          <ws-form-item label="容量(克/升)" span="1" prop="contractNo">
+            <ws-input
+              v-model="deptBudgetList.contractGoodsInfo.bulkDensity"
+              placeholder="请输入容量(克/升)"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
 
-            <!--热损伤(%)<=-->
-            <ws-form-item label="热损伤(%)" span="1" prop="contractNo">
-              <ws-input
-                v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
-                placeholder="请输入热损伤(%)"
-                maxlength="100"
-                size="small"
-              />
-            </ws-form-item>
-            <!--不完整粒(%)<=-->
-            <ws-form-item label="不完整粒(%)" span="1" prop="contractNo">
-              <ws-input
-                v-model="deptBudgetList.contractGoodsInfo.imperfectGrain"
-                placeholder="请输入不完整粒(%)"
-                maxlength="100"
-                size="small"
-              />
-            </ws-form-item>
-          </ws-info-table>
-        </ws-form>
-      </div>
-      <div class="wenzi">
-        <h3>流程信息</h3>
-      </div>
-      <div class="center">
-        <ws-form
-          ref="deptBudgetList"
-          :rules="ruleDeptBudget"
-          :model="deptBudgetList"
-        >
-          <!--流程信息-->
+          <!--霉变粒(%)<=-->
+          <ws-form-item label="霉变粒(%)" span="1" prop="contractNo">
+            <ws-input
+              v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
+              placeholder="请输入霉变粒(%)"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
 
-          <ws-info-table>
-            <!--合同收入(元)-->
-            <ws-form-item label="合同收入(元)" span="1" prop="contractNo">
-              <ws-input
-                v-model="deptBudgetList.contractProcessInfo.goodsNameKey"
-                placeholder="请输入合同收入(元)"
-                maxlength="100"
-                size="small"
-              />
-            </ws-form-item>
+          <!--热损伤(%)<=-->
+          <ws-form-item label="热损伤(%)" span="1" prop="contractNo">
+            <ws-input
+              v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
+              placeholder="请输入热损伤(%)"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
+          <!--不完整粒(%)<=-->
+          <ws-form-item label="不完整粒(%)" span="1" prop="contractNo">
+            <ws-input
+              v-model="deptBudgetList.contractGoodsInfo.imperfectGrain"
+              placeholder="请输入不完整粒(%)"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
+        </ws-info-table>
+      </ws-form>
+    </div>
+    <div class="wenzi">
+      <h3>流程信息</h3>
+    </div>
+    <div class="center">
+      <ws-form
+        ref="deptBudgetList"
+        :rules="ruleDeptBudget"
+        :model="deptBudgetList"
+      >
+        <!--流程信息-->
 
-            <!--已开发票(元)-->
-            <ws-form-item label="已开发票(元)" span="1" prop="contractNo">
-              <ws-input
-                v-model="deptBudgetList.contractProcessInfo.goodsName"
-                placeholder="请输入已开发票(元))"
-                maxlength="100"
-                size="small"
-              />
-            </ws-form-item>
+        <ws-info-table>
+          <!--合同收入(元)-->
+          <ws-form-item label="合同收入(元)" span="1" prop="contractNo">
+            <ws-input
+              v-model="deptBudgetList.contractProcessInfo.goodsNameKey"
+              placeholder="请输入合同收入(元)"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
 
-            <!--费用支出(元)-->
-            <ws-form-item label="费用支出(元)" span="1" prop="contractNo">
-              <ws-input
-                v-model="deptBudgetList.contractProcessInfo.waterContent"
-                placeholder="请输入费用支出(元)"
-                maxlength="100"
-                size="small"
-              />
-            </ws-form-item>
+          <!--已开发票(元)-->
+          <ws-form-item label="已开发票(元)" span="1" prop="contractNo">
+            <ws-input
+              v-model="deptBudgetList.contractProcessInfo.goodsName"
+              placeholder="请输入已开发票(元))"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
 
-            <!--未开发票(元)-->
-            <ws-form-item label="未开发票(元)" span="1" prop="contractNo">
-              <ws-input
-                v-model="deptBudgetList.contractProcessInfo.impurity"
-                placeholder="请输入未开发票(元)"
-                maxlength="100"
-                size="small"
-              />
-            </ws-form-item>
-            <!--未回款(元)-->
-            <ws-form-item label="未回款(元)" span="1" prop="contractNo">
-              <ws-input
-                v-model="deptBudgetList.contractProcessInfo.mildewGrain"
-                placeholder="请输入未回款(元)"
-                maxlength="100"
-                size="small"
-              />
-            </ws-form-item>
+          <!--费用支出(元)-->
+          <ws-form-item label="费用支出(元)" span="1" prop="contractNo">
+            <ws-input
+              v-model="deptBudgetList.contractProcessInfo.waterContent"
+              placeholder="请输入费用支出(元)"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
+
+          <!--未开发票(元)-->
+          <ws-form-item label="未开发票(元)" span="1" prop="contractNo">
+            <ws-input
+              v-model="deptBudgetList.contractProcessInfo.impurity"
+              placeholder="请输入未开发票(元)"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
+          <!--未回款(元)-->
+          <ws-form-item label="未回款(元)" span="1" prop="contractNo">
+            <ws-input
+              v-model="deptBudgetList.contractProcessInfo.mildewGrain"
+              placeholder="请输入未回款(元)"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
 
-            <!--已完成发货量(吨)-->
-            <ws-form-item label="已完成发货量(吨)" span="1" prop="contractNo">
-              <ws-input
-                v-model="deptBudgetList.contractProcessInfo.imperfectGrain"
-                placeholder="请输入已完成发货量(吨)"
-                maxlength="100"
-                size="small"
+          <!--已完成发货量(吨)-->
+          <ws-form-item label="已完成发货量(吨)" span="1" prop="contractNo">
+            <ws-input
+              v-model="deptBudgetList.contractProcessInfo.imperfectGrain"
+              placeholder="请输入已完成发货量(吨)"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
+          <!--双章原件回收情况-->
+          <ws-form-item label="双章原件回收情况" span="1" prop="grade">
+            <ws-select
+              v-model="deptBudgetList.contractProcessInfo.grade"
+              placeholder=""
+              class="typeselect"
+              @change="selectpackingMethod"
+            >
+              <ws-option
+                v-for="item in ChapterTwoList"
+                :key="item.constKey"
+                :label="item.constValue"
+                :value="item.constValue"
               />
-            </ws-form-item>
-            <!--双章原件回收情况-->
-            <ws-form-item label="双章原件回收情况" span="1" prop="grade">
-              <ws-select
-                v-model="deptBudgetList.contractProcessInfo.grade"
-                placeholder=""
-                class="typeselect"
-                @change="selectpackingMethod"
-              >
-                <ws-option
-                  v-for="item in ChapterTwoList"
-                  :key="item.constKey"
-                  :label="item.constValue"
-                  :value="item.constValue"
-                />
-              </ws-select>
-            </ws-form-item>
-          </ws-info-table>
-        </ws-form>
-      </div>
+            </ws-select>
+          </ws-form-item>
+        </ws-info-table>
+      </ws-form>
+    </div>
 
-      <div class="wenzi">
-        <h3>备注信息</h3>
-      </div>
-      <div class="ce">
-        <ws-form
-          ref="deptBudgetList"
-          :rules="ruleDeptBudget"
-          :model="deptBudgetList"
-        >
-          <!--备注信息-->
-          <ws-input
-            v-model="deptBudgetList.remarks"
-            type="textarea"
-            row="3"
-            placeholder="请输入备注信息,不超过200字"
-            maxlength="200"
-          />
-          <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"
-          />
-        </ws-form>
-      </div>
-      <div style="text-align: right; padding: 10px" class="center">
-        <el-button
-          class="bg-bottom"
-          type="primary"
-          size="small"
-          @click="submit()"
-          >提交</el-button
-        >
-      </div>
+    <div class="wenzi">
+      <h3>备注信息</h3>
+    </div>
+    <div class="center">
+      <ws-form
+        ref="deptBudgetList"
+        :rules="ruleDeptBudget"
+        :model="deptBudgetList"
+      >
+        <!--备注信息-->
+        <ws-input
+          v-model="deptBudgetList.remarks"
+          type="textarea"
+          row="3"
+          placeholder="请输入备注信息,不超过200字"
+          maxlength="200"
+        />
+        <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"
+        />
+      </ws-form>
+    </div>
+    <div style="text-align: right; padding: 10px" class="center">
+      <el-button class="bg-bottom" type="primary" size="small" @click="submit()"
+        >提交</el-button
+      >
     </div>
   </div>
 </template>
@@ -1344,7 +1337,7 @@ export default {
   margin: 6px 0px;
 }
 .wenzi {
-  width: 900px;
+  width: 70%;
   margin: 0 auto;
 }
 .wenzi h3 {
@@ -1355,7 +1348,7 @@ export default {
   display: inline-block;
 }
 .center {
-  width: 900px;
+  width: 70%;
   margin: 0 auto;
 }
 .el-form-item {
@@ -1450,8 +1443,6 @@ export default {
 /deep/.el-input,
 /deep/.el-date-editor {
   font-size: 13px;
-  width: 232px;
-  left: 21px;
 }
 /deep/.el-textarea {
   width: 900px;
@@ -1474,6 +1465,5 @@ export default {
 /deep/.el-input--small .el-input__inner {
   height: 32px;
   line-height: 32px;
-  width: 232px;
 }
 </style>

+ 217 - 296
src/views/warehouse/warehouseManagementAdd.vue

@@ -27,13 +27,7 @@
       :rules="mainReportAdd"
       :model="deptBudgetList"
     >
-      <!-- <div class="remark">
-        <h3>基本信息</h3>
-        <p style="color: #8890b1">
-          注:基本信息和货物信息均为必填项,“*” 标记的条目提交后不可修改。
-        </p>
-      </div> -->
-
+     
       <ws-info-table>
         <!--仓库名称-->
         <ws-form-item
@@ -50,6 +44,15 @@
             :rules="ruleDeptBudget"
           />
         </ws-form-item>
+        <!--负责人-->
+        <ws-form-item label="负责人" span="1" prop="buyer" class="readonly">
+          <ws-input
+            v-model="deptBudgetList.buyer"
+            placeholder="请输入负责人姓名"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
 
         <!--负责人电话-->
         <ws-form-item label="负责人电话" span="1" prop="shippingType">
@@ -151,37 +154,68 @@
           />
         </ws-form-item>
 
-        <!--卖方-->
-        <ws-form-item label="货仓编号" span="1" prop="contractNo">
+       <!--仓库编号-->
+      <ws-form-item
+          label="仓库编号"
+          span="1"
+          prop="contractNo"
+          class="readonly"
+        >
+          <ws-input
+            v-model="deptBudgetList.contractNo"
+            placeholder="请输入仓库编号"
+            maxlength="20"
+            size="small"
+            :rules="ruleDeptBudget"
+          />
+        </ws-form-item>
+
+      <ws-form-item label="仓位储存(吨)" span="1" prop="contractNo">
           <ws-input
             v-model.number="deptBudgetList.buyerPhone"
-            
+            placeholder="请输入仓位最大容量"
             maxlength="100"
             size="small"
           />
         </ws-form-item>
 
-        <!--货源地-->
-        <ws-form-item label="货源地" span="1" prop="sourceGoods">
+        <!--备注(选项)-->
+        <ws-form-item label="备注(选项)" span="1" prop="placeDelivery">
           <ws-input
-            v-model="deptBudgetList.sourceGoods"
-            placeholder="请输入货源地"
+            v-model="deptBudgetList.placeDelivery"
+            placeholder="请输入货地"
             maxlength="100"
             size="small"
           />
+           
+        </ws-form-item>
+        
+        <ws-form-item
+          label="仓库编号"
+          span="1"
+          prop="contractNo"
+          class="readonly"
+        >
+          <ws-input
+            v-model="deptBudgetList.contractNo"
+            placeholder="请输入仓库编号"
+            maxlength="20"
+            size="small"
+            :rules="ruleDeptBudget"
+          />
         </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="请输入仓位最大容量"
             maxlength="100"
             size="small"
           />
         </ws-form-item>
 
-        <!--交货地-->
-        <ws-form-item label="交货地" span="1" prop="placeDelivery">
+        <!--备注(选项)-->
+        <ws-form-item label="备注(选项)" span="1" prop="placeDelivery">
           <ws-input
             v-model="deptBudgetList.placeDelivery"
             placeholder="请输入交货地"
@@ -190,389 +224,247 @@
           />
         </ws-form-item>
 
-        <!--卖方电话-->
-        <ws-form-item label="卖方电话" span="1" prop="sellerPhone">
+        <ws-form-item
+          label="仓库编号"
+          span="1"
+          prop="contractNo"
+          class="readonly"
+        >
           <ws-input
-            v-model="deptBudgetList.sellerPhone"
-            placeholder="请输入卖方电话"
-            maxlength="100"
+            v-model="deptBudgetList.contractNo"
+            placeholder="请输入仓库编号"
+            maxlength="20"
             size="small"
+            :rules="ruleDeptBudget"
           />
         </ws-form-item>
 
-        <!--包装方式-->
-        <ws-form-item label="包装方式" span="1" prop="packingMethod">
-          <ws-select
-            v-model="deptBudgetList.packingMethod"
-            placeholder=""
-            class="typeselect"
-            :value="value1"
-            @change="selectpackingMethod"
-          >
-            <ws-option
-              v-for="item in packtypeList"
-              :key="item.constKey"
-              :label="item.constValue"
-              :value="item.constValue"
-            />
-          </ws-select>
-        </ws-form-item>
-
-        <!--重量(吨)-->
-        <ws-form-item label="重量(吨)" span="1" prop="weight">
+      <ws-form-item label="仓位储存(吨)" span="1" prop="contractNo">
           <ws-input
-            v-model="deptBudgetList.weight"
-            placeholder="请输入重量(吨)"
+            v-model.number="deptBudgetList.buyerPhone"
+            placeholder="请输入仓位最大容量"
             maxlength="100"
             size="small"
           />
         </ws-form-item>
 
-        <!--验收方式-->
-        <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
-          <el-select
-            v-model="deptBudgetList.acceptanceMethod"
-            placeholder="请选择验收方式"
-            style="width: 100%"
-            filterable
-            @change="selectunitList"
-          >
-            <el-option
-              v-for="(item, index) in unitList"
-              :key="item.constValue"
-              :label="item.constValue"
-              :value="item.constValue"
-            >
-              <span class="unit-left" style="float: left">
-                <span v-if="item.flag == 'delete'"> {{ item.constValue }}</span>
-                <!-- 新增文本框 -->
-                <div
-                  style="width: 160px"
-                  v-if="item.flag !== 'delete'"
-                  @click.stop
-                >
-                  <ws-input
-                    v-model="item.constValue"
-                    clearable
-                    maxlength="10"
-                    style="width: 100%"
-                  ></ws-input>
-                </div>
-              </span>
-              <span style="float: right; color: #8492a6; font-size: 13px">
-                <!-- 对号 -->
-                <i
-                  class="el-icon-check"
-                  style="line-height: 29px; margin-left: 10px"
-                  v-if="item.flag !== 'delete'"
-                  @click.stop="saveClick(item, index)"
-                ></i>
-                <!-- 编辑 -->
-                <i
-                  class="el-icon-edit"
-                  style="line-height: 29px; margin-left: 10px"
-                  v-if="item.flag == 'delete'"
-                  @click.stop="editClick(item, index)"
-                ></i>
-                <!-- 删除 -->
-                <i
-                  class="el-icon-delete"
-                  style="line-height: 29px"
-                  @click.stop="deleteClick(item, index)"
-                ></i>
-              </span>
-            </el-option>
-            <!-- 新增按钮 -->
-            <el-option value="" label="">
-              <div
-                style="
-                  text-align: right;
-                  border-top: 1px solid #dcdfe6;
-                  padding: 5px;
-                "
-              >
-                <ws-button type="primary" @click.stop="addClick">{{
-                  $t('button.add')
-                }}</ws-button>
-              </div>
-            </el-option>
-          </el-select>
-        </ws-form-item>
-
-        <!--溢短装(%)-->
-        <ws-form-item label="溢短装(%)" span="1" prop="overShort">
+        <!--备注(选项)-->
+        <ws-form-item label="备注(选项)" span="1" prop="placeDelivery">
           <ws-input
-            v-model="deptBudgetList.overShort"
-            placeholder="请输入溢短装比例(%)"
+            v-model="deptBudgetList.placeDelivery"
+            placeholder="请输入交货地"
             maxlength="100"
             size="small"
           />
         </ws-form-item>
-        <!--交货日期(起)-->
-        <ws-form-item label="交货日期(起)" span="1" prop="deliveryDateStart">
-          <ws-date-picker
-            :picker-options="pickerBeginDateBefore"
-            v-model="deptBudgetList.deliveryDateStart"
-            type="date"
-            default-value="1980-01-01"
-            placeholder="请选择交货日期(起)"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
-          />
-        </ws-form-item>
-
-        <!--合同单价(元/吨)-->
+        <el-button icon="el-icon-search" circle></el-button>
         <ws-form-item
-          class="readonly"
-          label="合同单价(元/吨)"
+          label="仓库编号"
           span="1"
-          prop="unitContractPrice"
+          prop="contractNo"
+          class="readonly"
         >
           <ws-input
-            v-model="deptBudgetList.unitContractPrice"
-            placeholder="请输入合同单价"
-            maxlength="100"
+            v-model="deptBudgetList.contractNo"
+            placeholder="请输入仓库编号"
+            maxlength="20"
             size="small"
+            :rules="ruleDeptBudget"
           />
         </ws-form-item>
 
-        <!--交货日期(止)-->
-        <ws-form-item label="交货日期(止)" span="1" prop="deliveryDateEnd">
-          <ws-date-picker
-            :picker-options="pickerBeginDateBefore"
-            v-model="deptBudgetList.deliveryDateEnd"
-            type="date"
-            default-value="1980-01-01"
-            placeholder="请选择交货日期(起)"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
+      <ws-form-item label="仓位储存(吨)" span="1" prop="contractNo">
+          <ws-input
+            v-model.number="deptBudgetList.buyerPhone"
+            placeholder="请输入仓位最大容量"
+            maxlength="100"
+            size="small"
           />
         </ws-form-item>
 
-        <!--合同总价-->
-        <ws-form-item label="合同总价" span="1" prop="totalContractPrice">
+        <!--备注(选项)-->
+        <ws-form-item label="备注(选项)" span="1" prop="placeDelivery">
           <ws-input
-            v-model="deptBudgetList.totalContractPrice"
-            placeholder="请输入合同总价"
+            v-model="deptBudgetList.placeDelivery"
+            placeholder="请输入交货地"
             maxlength="100"
             size="small"
           />
         </ws-form-item>
-
-        <!--签订日期-->
-        <ws-form-item label="签订日期" span="1" prop="signingDate">
-          <ws-date-picker
-            :picker-options="pickerBeginDateBefore"
-            v-model="deptBudgetList.signingDate"
-            type="date"
-            default-value="1980-01-01"
-            placeholder="请选择合同签订日期"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
+        <ws-form-item
+          label="仓库编号"
+          span="1"
+          prop="contractNo"
+          class="readonly"
+        >
+          <ws-input
+            v-model="deptBudgetList.contractNo"
+            placeholder="请输入仓库编号"
+            maxlength="20"
+            size="small"
+            :rules="ruleDeptBudget"
           />
         </ws-form-item>
-      </ws-info-table>
-    </ws-form>
-    <div class="wenzi">
-      <h3>货物信息</h3>
-    </div>
-    <ws-form
-      ref="deptBudgetList"
-      :rules="ruleDeptBudget"
-      :model="deptBudgetList"
-    >
-      <!--货物信息-->
 
-      <ws-info-table>
-        <!--货名-->
-        <ws-form-item label="货名" span="1" prop="goodsName" class="readonly">
-          <ws-select
-            v-model="deptBudgetList.contractGoodsInfo.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="waterContent">
+      <ws-form-item label="仓位储存(吨)" span="1" prop="contractNo">
           <ws-input
-            v-model="deptBudgetList.contractGoodsInfo.waterContent"
-            placeholder="请输入水分占比"
+            v-model.number="deptBudgetList.buyerPhone"
+            placeholder="请输入仓位最大容量"
             maxlength="100"
             size="small"
           />
         </ws-form-item>
 
-        <!--品级-->
-        <ws-form-item label="品级" span="1" prop="grade">
-          <ws-select
-            v-model="deptBudgetList.contractGoodsInfo.grade"
-            placeholder=""
-            class="typeselect"
-            @change="selectgrade"
-          >
-            <ws-option
-              v-for="item in gradeList"
-              :key="item.constKey"
-              :label="item.constValue"
-              :value="item.constValue"
-            />
-          </ws-select>
+        <!--备注(选项)-->
+        <ws-form-item label="备注(选项)" span="1" prop="placeDelivery">
+          <ws-input
+            v-model="deptBudgetList.placeDelivery"
+            placeholder="请输入交货地"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item><ws-form-item
+          label="仓库编号"
+          span="1"
+          prop="contractNo"
+          class="readonly"
+        >
+          <ws-input
+            v-model="deptBudgetList.contractNo"
+            placeholder="请输入仓库编号"
+            maxlength="20"
+            size="small"
+            :rules="ruleDeptBudget"
+          />
         </ws-form-item>
 
-        <!--杂质(%)<=-->
-        <ws-form-item label="杂质(%)" span="1" prop="impurity">
+      <ws-form-item label="仓位储存(吨)" span="1" prop="contractNo">
           <ws-input
-            v-model="deptBudgetList.contractGoodsInfo.impurity"
-            placeholder="请输入杂质占比(%)"
+            v-model.number="deptBudgetList.buyerPhone"
+            placeholder="请输入仓位最大容量"
             maxlength="100"
             size="small"
           />
         </ws-form-item>
 
-        <!--容量(克/升)>=-->
-        <ws-form-item label="容量(克/升)" span="1" prop="bulkDensity">
+        <!--备注(选项)-->
+        <ws-form-item label="备注(选项)" span="1" prop="placeDelivery">
           <ws-input
-            v-model="deptBudgetList.contractGoodsInfo.bulkDensity"
-            placeholder="请输入容重"
+            v-model="deptBudgetList.placeDelivery"
+            placeholder="请输入交货地"
             maxlength="100"
             size="small"
           />
         </ws-form-item>
+        <ws-form-item
+          label="仓库编号"
+          span="1"
+          prop="contractNo"
+          class="readonly"
+        >
+          <ws-input
+            v-model="deptBudgetList.contractNo"
+            placeholder="请输入仓库编号"
+            maxlength="20"
+            size="small"
+            :rules="ruleDeptBudget"
+          />
+        </ws-form-item>
 
-        <!--霉变粒(%)<=-->
-        <ws-form-item label="霉变粒(%)" span="1" prop="mildewGrain">
+      <ws-form-item label="仓位储存(吨)" span="1" prop="contractNo">
           <ws-input
-            v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
-            placeholder="请输入霉变粒占比(%)"
+            v-model.number="deptBudgetList.buyerPhone"
+            placeholder="请输入仓位最大容量"
             maxlength="100"
             size="small"
           />
         </ws-form-item>
 
-        <!--热损伤(%)<=-->
-        <ws-form-item label="热损伤(%)" span="1" prop="jiaorenli">
+        <!--备注(选项)-->
+        <ws-form-item label="备注(选项)" span="1" prop="placeDelivery">
           <ws-input
-            v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
-            placeholder="请输入输入热损伤占比(%)"
+            v-model="deptBudgetList.placeDelivery"
+            placeholder="请输入交货地"
             maxlength="100"
             size="small"
           />
         </ws-form-item>
-        <!--不完整粒(%)<=-->
-        <ws-form-item label="不完整粒(%)" span="1" prop="imperfectGrain">
+        <ws-form-item
+          label="仓库编号"
+          span="1"
+          prop="contractNo"
+          class="readonly"
+        >
           <ws-input
-            v-model="deptBudgetList.contractGoodsInfo.imperfectGrain"
-            placeholder="请输入不完整粒占比(%)"
-            maxlength="100"
+            v-model="deptBudgetList.contractNo"
+            placeholder="请输入仓库编号"
+            maxlength="20"
             size="small"
+            :rules="ruleDeptBudget"
           />
         </ws-form-item>
-      </ws-info-table>
-    </ws-form>
 
-    <div class="wenzi">
-      <h3>流程信息</h3>
-    </div>
-    <ws-form
-      ref="deptBudgetList"
-      :rules="ruleDeptBudget"
-      :model="deptBudgetList"
-    >
-      <!--流程信息-->
-
-      <ws-info-table>
-        <!--合同收入(元)-->
-        <ws-form-item label="合同收入(元)" span="1" prop="goodsNameKey">
+      <ws-form-item label="仓位储存(吨)" span="1" prop="contractNo">
           <ws-input
-            v-model="deptBudgetList.contractProcessInfo.goodsNameKey"
-            placeholder="请输入合同收入(元)"
+            v-model.number="deptBudgetList.buyerPhone"
+            placeholder="请输入仓位最大容量"
             maxlength="100"
             size="small"
           />
         </ws-form-item>
 
-        <!--已开发票(元)-->
-        <ws-form-item label="已开发票(元)" span="1" prop="goodsName">
+        <!--备注(选项)-->
+        <ws-form-item label="备注(选项)" span="1" prop="placeDelivery">
           <ws-input
-            v-model="deptBudgetList.contractProcessInfo.goodsName"
-            placeholder="请输入已开发票(元)"
+            v-model="deptBudgetList.placeDelivery"
+            placeholder="请输入交货地"
             maxlength="100"
             size="small"
           />
         </ws-form-item>
-
-        <!--费用支出(元)-->
-        <ws-form-item label="费用支出(元)" span="1" prop="waterContent">
+        <ws-form-item
+          label="仓库编号"
+          span="1"
+          prop="contractNo"
+          class="readonly"
+        >
           <ws-input
-            v-model="deptBudgetList.contractProcessInfo.waterContent"
-            placeholder="请输入费用支出(元)"
-            maxlength="100"
+            v-model="deptBudgetList.contractNo"
+            placeholder="请输入仓库编号"
+            maxlength="20"
             size="small"
+            :rules="ruleDeptBudget"
           />
         </ws-form-item>
 
-        <!--未开发票(元)-->
-        <ws-form-item label="未开发票(元)" span="1" prop="impurity">
+      <ws-form-item label="仓位储存(吨)" span="1" prop="contractNo">
           <ws-input
-            v-model="deptBudgetList.contractProcessInfo.impurity"
-            placeholder="请输入未开发票(元)"
+            v-model.number="deptBudgetList.buyerPhone"
+            placeholder="请输入仓位最大容量"
             maxlength="100"
             size="small"
           />
         </ws-form-item>
-        <!--已完成发货量(吨)-->
-        <ws-form-item label="已完成发货量(吨)" span="1" prop="imperfectGrain">
+
+        <!--备注(选项)-->
+        <ws-form-item label="备注(选项)" span="1" prop="placeDelivery">
           <ws-input
-            v-model="deptBudgetList.contractProcessInfo.imperfectGrain"
-            placeholder="请输入已完成发货量(吨)"
+            v-model="deptBudgetList.placeDelivery"
+            placeholder="请输入交货地"
             maxlength="100"
             size="small"
           />
         </ws-form-item>
-        <!--双章原件回收情况-->
-        <ws-form-item label="双章原件回收情况" span="1" prop="grade">
-          <ws-select
-            v-model="deptBudgetList.contractProcessInfo.grade"
-            placeholder=""
-            class="typeselect"
-            @change="selectChapterTwo"
-          >
-            <ws-option
-              v-for="item in ChapterTwoList"
-              :key="item.constKey"
-              :label="item.constValue"
-              :value="item.constValue"
-            />
-          </ws-select>
-        </ws-form-item>
       </ws-info-table>
     </ws-form>
 
-    <div class="wenzi">
-      <h3>备注信息</h3>
-    </div>
+   
     <ws-form
       ref="deptBudgetList"
       :rules="ruleDeptBudget"
       :model="deptBudgetList"
     >
-      <!--备注信息-->
-      <ws-input
-        v-model="deptBudgetList.remarks"
-        type="textarea"
-        row="3"
-        placeholder="请输入备注信息,不超过200字"
-        maxlength="200"
-      />
+      
       <ws-upload
         ref="upload"
         table-name="maintain_work_order"
@@ -585,7 +477,20 @@
         @onChange="onChange"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
       />
+       <!--仓库定位-->
+      <ws-form-item label="仓库定位:" span="1" prop="seller" class="readonly">
+        
+          <ws-input
+            v-model="deptBudgetList.seller"
+            placeholder="请输入地名,北京"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+      
+        
     </ws-form>
+      <!-- 提交 -->
     <div style="text-align: right; padding: 10px" class="center">
       <el-button
         class="bg-bottom"
@@ -595,6 +500,7 @@
         >提交</el-button
       >
     </div>
+
   </div>
 </template>
 <script>
@@ -1493,4 +1399,19 @@ export default {
 /deep/.ws-info-table[data-v-850a44a6] .el-form-item .el-form-item__label {
   width: 130px;
 }
+.ws-info-table[data-v-850a44a6] .el-form-item{
+  width: 30%;
+}
+.readonly[data-v-096f9e7e]:after{
+  display: none;
+}
+.el-textarea__inner{
+  display: none;
+}
+.el-form[data-v-096f9e7e]{
+  margin-top: 50px;
+}
+.readonly{
+  width: 16%;
+}
 </style>

+ 1 - 1
src/views/warehouse/warehouseManagementList.vue

@@ -229,7 +229,7 @@ export default {
     },
     //盘损
     loss(){
-       this.$router.push({ path: 'warehouseManagementIoss' })
+        this.$router.push({ path: 'warehouseManagementIoss' })
     },
 
     handleLook() {