前端mxx

package-lock.json

@@ -3528,8 +3528,8 @@
     },
     "agentkeepalive": {
       "version": "3.5.2",
-      "resolved": "https://registry.npm.taobao.org/agentkeepalive/download/agentkeepalive-3.5.2.tgz?cache=0&sync_timestamp=1587827377602&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fagentkeepalive%2Fdownload%2Fagentkeepalive-3.5.2.tgz",
-      "integrity": "sha1-oROSTdP6JKC8O3gQjEUMKr7gD2c=",
+      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.2.tgz",
+      "integrity": "sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==",
       "requires": {
         "humanize-ms": "^1.2.1"
       }
@@ -3575,13 +3575,12 @@
       "integrity": "sha1-75FuJxxkrBIXH9g4TqrmsjRYVNo="
     },
     "ali-oss": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npm.taobao.org/ali-oss/download/ali-oss-6.8.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fali-oss%2Fdownload%2Fali-oss-6.8.0.tgz",
-      "integrity": "sha1-W76Qbmdi1eUFHDUQP77hD52YvPg=",
+      "version": "6.15.2",
+      "resolved": "https://registry.npmjs.org/ali-oss/-/ali-oss-6.15.2.tgz",
+      "integrity": "sha512-sLB3a2Q6BvD4fNfHO4a0uuVn+5dlFaWUE/tExFk8bNMTevNGb4hH419kyvTSvKsO8FGLIhyezdi2NVhLHwhPqA==",
       "requires": {
         "address": "^1.0.0",
         "agentkeepalive": "^3.4.1",
-        "any-promise": "^1.3.0",
         "bowser": "^1.6.0",
         "co-defer": "^1.0.0",
         "copy-to": "^2.0.1",
@@ -3595,15 +3594,23 @@
         "js-base64": "^2.5.2",
         "jstoxml": "^0.2.3",
         "merge-descriptors": "^1.0.1",
-        "mime": "^1.3.4",
+        "mime": "^2.4.5",
         "mz-modules": "^2.1.0",
         "platform": "^1.3.1",
+        "pump": "^3.0.0",
         "sdk-base": "^2.0.1",
         "stream-http": "2.8.2",
         "stream-wormhole": "^1.0.4",
         "urllib": "^2.33.1",
         "utility": "^1.8.0",
         "xml2js": "^0.4.16"
+      },
+      "dependencies": {
+        "mime": {
+          "version": "2.5.2",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
+          "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg=="
+        }
       }
     },
     "alphanum-sort": {
@@ -4757,8 +4764,8 @@
     },
     "bowser": {
       "version": "1.9.4",
-      "resolved": "https://registry.npm.taobao.org/bowser/download/bowser-1.9.4.tgz",
-      "integrity": "sha1-iQxYooE6nTJDcEM0+oG5alwVDJo="
+      "resolved": "https://registry.npmjs.org/bowser/-/bowser-1.9.4.tgz",
+      "integrity": "sha512-9IdMmj2KjigRq6oWhmwv1W36pDuA4STQZ8q6YO9um+x07xgYNCD3Oou+WP/3L1HNz7iqythGet3/p4wvc8AAwQ=="
     },
     "boxen": {
       "version": "5.0.1",
@@ -10582,8 +10589,8 @@
     },
     "is-class-hotfix": {
       "version": "0.0.6",
-      "resolved": "http://registry.npm.taobao.org/is-class-hotfix/download/is-class-hotfix-0.0.6.tgz",
-      "integrity": "sha1-pSfTH7IyeSgd3l84XHe13nCnJDU="
+      "resolved": "https://registry.npmjs.org/is-class-hotfix/-/is-class-hotfix-0.0.6.tgz",
+      "integrity": "sha512-0n+pzCC6ICtVr/WXnN2f03TK/3BfXY7me4cjCAqT8TYXEl0+JBRoqBo94JJHXcyDSLUeWbNX8Fvy5g5RJdAstQ=="
     },
     "is-color-stop": {
       "version": "1.1.0",
@@ -10828,8 +10835,8 @@
     },
     "is-type-of": {
       "version": "1.2.1",
-      "resolved": "http://registry.npm.taobao.org/is-type-of/download/is-type-of-1.2.1.tgz",
-      "integrity": "sha1-4mPsOFes608oxHEw7HjbCakg+MU=",
+      "resolved": "https://registry.npmjs.org/is-type-of/-/is-type-of-1.2.1.tgz",
+      "integrity": "sha512-uK0kyX9LZYhSDS7H2sVJQJop1UnWPWmo5RvR3q2kFH6AUHYs7sOrVg0b4nyBHw29kRRNFofYN/JbHZDlHiItTA==",
       "requires": {
         "core-util-is": "^1.0.2",
         "is-class-hotfix": "~0.0.6",
@@ -12493,8 +12500,8 @@
     },
     "mz-modules": {
       "version": "2.1.0",
-      "resolved": "http://registry.npm.taobao.org/mz-modules/download/mz-modules-2.1.0.tgz",
-      "integrity": "sha1-f1KYd6/Q1C9AmnRjuWmG1hz7z5Y=",
+      "resolved": "https://registry.npmjs.org/mz-modules/-/mz-modules-2.1.0.tgz",
+      "integrity": "sha512-sjk8lcRW3vrVYnZ+W+67L/2rL+jbO5K/N6PFGIcLWTiYytNr22Ah9FDXFs+AQntTM1boZcoHi5qS+CV1seuPog==",
       "requires": {
         "glob": "^7.1.2",
         "ko-sleep": "^1.0.3",
@@ -13822,9 +13829,9 @@
       }
     },
     "platform": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npm.taobao.org/platform/download/platform-1.3.5.tgz",
-      "integrity": "sha1-+2lYxpbgfikY0u7aDwvJRI1zNEQ="
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/platform/-/platform-1.3.6.tgz",
+      "integrity": "sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg=="
     },
     "please-upgrade-node": {
       "version": "3.2.0",
@@ -16558,8 +16565,8 @@
     },
     "stream-wormhole": {
       "version": "1.1.0",
-      "resolved": "https://registry.npm.taobao.org/stream-wormhole/download/stream-wormhole-1.1.0.tgz",
-      "integrity": "sha1-MAr/Rs7VU8/sZCoFJRiFQXaTwz0="
+      "resolved": "https://registry.npmjs.org/stream-wormhole/-/stream-wormhole-1.1.0.tgz",
+      "integrity": "sha512-gHFfL3px0Kctd6Po0M8TzEvt3De/xu6cnRrjlfYNhwbhLPLwigI2t1nc6jrzNuaYg5C4YF78PPFuQPzRiqn9ew=="
     },
     "string-argv": {
       "version": "0.3.1",
@@ -19347,47 +19354,47 @@
       "dependencies": {
         "axios": {
           "version": "0.19.2",
-          "resolved": "https://registry.npm.taobao.org/axios/download/axios-0.19.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faxios%2Fdownload%2Faxios-0.19.2.tgz",
-          "integrity": "sha1-PqNsXYgY0NX4qKl6bTa4bNwAyyc=",
+          "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
+          "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
           "requires": {
             "follow-redirects": "1.5.10"
           }
         },
         "debug": {
           "version": "3.1.0",
-          "resolved": "https://registry.npm.taobao.org/debug/download/debug-3.1.0.tgz",
-          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
           "requires": {
             "ms": "2.0.0"
           }
         },
         "follow-redirects": {
           "version": "1.5.10",
-          "resolved": "https://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.5.10.tgz",
-          "integrity": "sha1-e3qfmuov3/NnhqlP9kPtB/T/Xio=",
+          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
+          "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
           "requires": {
             "debug": "=3.1.0"
           }
         },
         "js-cookie": {
           "version": "2.2.1",
-          "resolved": "https://registry.npm.taobao.org/js-cookie/download/js-cookie-2.2.1.tgz",
-          "integrity": "sha1-aeEG3F1YBolFYpAqpbrsN0Tpsrg="
+          "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.1.tgz",
+          "integrity": "sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ=="
         },
         "mime": {
-          "version": "2.4.6",
-          "resolved": "https://registry.npm.taobao.org/mime/download/mime-2.4.6.tgz?cache=0&sync_timestamp=1590596728112&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmime%2Fdownload%2Fmime-2.4.6.tgz",
-          "integrity": "sha1-5bQHyQ20QvK+tbFiNz0Htpr/pNE="
+          "version": "2.5.2",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
+          "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg=="
         },
         "ms": {
           "version": "2.0.0",
-          "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
         },
         "url-loader": {
           "version": "3.0.0",
-          "resolved": "https://registry.npm.taobao.org/url-loader/download/url-loader-3.0.0.tgz",
-          "integrity": "sha1-nx8Rs3Gs9uUe0VpQ22NeAu7Bg2g=",
+          "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-3.0.0.tgz",
+          "integrity": "sha512-a84JJbIA5xTFTWyjjcPdnsu+41o/SNE8SpXMdUvXs6Q+LuhCD9E2+0VCiuDWqgo3GGXVlFHzArDmBpj9PgWn4A==",
           "requires": {
             "loader-utils": "^1.2.3",
             "mime": "^2.4.4",
@@ -19745,8 +19752,8 @@
     },
     "xml2js": {
       "version": "0.4.23",
-      "resolved": "https://registry.npm.taobao.org/xml2js/download/xml2js-0.4.23.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fxml2js%2Fdownload%2Fxml2js-0.4.23.tgz",
-      "integrity": "sha1-oMaVFnUkIesqx1juTUzPWIQ+rGY=",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
+      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
       "requires": {
         "sax": ">=0.6.0",
         "xmlbuilder": "~11.0.0"

src/api/V2/warehouse/index.js

@@ -4,9 +4,26 @@ export const API_POST_ADD_WAREHOUSE_BASEINFO = '/warehouseBaseInfo/api/addWareho
 export const API_GET_WAREHOUSE_LOOK = '/warehouseBaseInfo/getWarehouse'
 //仓库名称下拉
 export const API_GET_WAREHOUSE_CUSTOMDROPDOWN = '/warehouseBaseInfo/selectWarehouse'
+
 //删除
 export const API_POST_WAREHOUSE_DELETE = '/warehouseBaseInfo/api/deleteWarehouse'
 //删除仓库列表
 export const API_GET_WAREHOUSE_DELETELIST ='/warehouseBaseInfo/selectAllWarehouse'
 //隐藏
 export const API_POST_WAREHOUSE_HIDE ='/warehouseBaseInfo/api/editShow'
+
+
+export const API_GET_WAREHOUSE_DELETE = '/warehouseBaseInfo/api/deleteWarehouse'
+
+//仓库编辑
+export const API_POST_WAREHOUSE_EDIT = '/warehouseBaseInfo/api/editWarehouse'
+//盘损
+export const API_POST_WAREHOUSE_IOSS = '/warehouseInventoryCountInfo/getInfo'
+//货名下拉
+export const API_POST_WAREHOUSE_NAME = '/warehousePositionStorageInfo/selectGoodsName'
+
+// 货名等下拉
+export const API_GET_CUSTOMDROPDOWN_CUSTOMDROPDOWN = `/commonSysParameter/getInfo`
+// 入库添加
+export const API_POST_STORAGE_PUT = `/warehouseInOutInfo/InOutWarehouse `
+

src/model/warehouse/index.js

@@ -8,6 +8,12 @@ import {
     API_POST_WAREHOUSE_DELETE,
     API_GET_WAREHOUSE_DELETELIST,
     API_POST_WAREHOUSE_HIDE,
+    API_GET_WAREHOUSE_DELETE,
+    API_POST_WAREHOUSE_EDIT,
+    API_POST_WAREHOUSE_IOSS,
+    API_POST_WAREHOUSE_NAME,
+    API_GET_CUSTOMDROPDOWN_CUSTOMDROPDOWN,
+    API_POST_STORAGE_PUT
 } from '@/api/V2/warehouse'
 // 列表
 export const getList = appRx.get(API_GET_WAREHOUSE_BASEINFO, errorCatcher, errorHandle, filter)
@@ -18,8 +24,22 @@ export const getLook = appRx.get(API_GET_WAREHOUSE_LOOK, errorCatcher, errorHand
 //仓库下拉
 export const xiala = appRx.get( API_GET_WAREHOUSE_CUSTOMDROPDOWN, errorCatcher, errorHandle, filter)
 //删除
+
 export const deletewarehouse = appRx.post(API_POST_WAREHOUSE_DELETE, errorCatcher, errorHandle, filter)
 //删除库房列表
 export const delectlist = appRx.get(API_GET_WAREHOUSE_DELETELIST, errorCatcher, errorHandle, filter)
 //隐藏
-export const hide = appRx.post(API_POST_WAREHOUSE_HIDE, errorCatcher, errorHandle, filter)
+export const hide = appRx.post(API_POST_WAREHOUSE_HIDE, errorCatcher, errorHandle, filter)
+
+export const deletewarehouse = appRx.get(API_GET_WAREHOUSE_DELETE, errorCatcher, errorHandle, filter)
+//仓库编辑
+export const edit = appRx.post(API_POST_WAREHOUSE_EDIT, errorCatcher, errorHandle, filter)
+//盘损
+export const ioss = appRx.post(API_POST_WAREHOUSE_IOSS, errorCatcher, errorHandle, filter)
+//货名下拉
+export const goodsname = appRx.get(API_POST_WAREHOUSE_NAME, errorCatcher, errorHandle, filter)
+// 货名等下拉
+export const pullDown = appRx.get(API_GET_CUSTOMDROPDOWN_CUSTOMDROPDOWN, errorCatcher, errorHandle, filter)
+// 入库添加
+export const addstorageputList = appRx.post(API_POST_STORAGE_PUT, errorCatcher, errorHandle, filter)
+

src/views/contractManagement/salesContractAdd.vue

@@ -590,31 +590,19 @@ export default {
       // onChange:{},
       unitList: [],
       goodnameList: [],
-
       gradeList: [],
       ChapterTwoList: [],
-
       deptBudgetList: {
         contractGoodsInfo: {
           goodsName: '',
         },
         contractProcessInfo: {},
       },
-
       pickerBeginDateBefore: {
         disabledDate: (time) => {
           return time.getTime() > Date.now()
         },
       },
-      // selectpackingMethod: {},
-      // selectgrade: {},
-      // selectunitList: {},
-      // selectDuty: {},
-      // isEdited: false,
-      // registered: {},
-      // selectCrtDuty: {},
-      // dutyList: {},
-      // sexList: {},
       ruleDeptBudget: {
         contractNo: [
           { required: true, message: '请输入活动名称', trigger: 'blur' },

src/views/warehouse/component/router/index.js

@@ -46,6 +46,7 @@ const warehouseManagementRouter = {
 
     {
       path: 'warehouseManagementEdit',
+             
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/warehouse/warehouseManagementEdit'),
       name: 'warehouseManagementEdit',
@@ -53,6 +54,8 @@ const warehouseManagementRouter = {
         title: 'warehouseManagementEdit',
         shortcutEntrance: 'warehouseManagementEdit',
         module: 'warehouse.warehouseManagementEdit',
+        permissicon: [],
+        keepAlive: true
       },
       hidden: true
     },

src/views/warehouse/warehouseManagementDelivery.vue

@@ -1,9 +1,9 @@
-// 出库登记
+// 入库登记
 <template>
   <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
@@ -15,223 +15,224 @@
         >
       </el-col>
     </el-row>
-    <div class="center">
-      <h2>鲅鱼圈一号库 102仓位</h2>
-      <ws-form ref="deptBudgetList" :model="deptBudgetList">
-        <!-- 货名 -->
-        <ws-form-item label="货名" span="1" class="readonly">
-          <ws-select
-            placeholder=""
-            class="typeselect"
-            @change="selectpackingMethod"
+
+    <ws-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules">
+      <div class="basicInformation">
+        <h2>
+          {{ deptBudgetList.warehouseName }}库
+          {{ deptBudgetList.binNumber }}仓位
+        </h2>
+        <ws-info-table>
+          <!-- 货名 -->
+          <ws-form-item label="货名" span="1">
+            <ws-select
+              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="grossWeight">
+            <ws-input
+              @input="grossWeightchange"
+              v-model="deptBudgetList.grossWeight"
+              placeholder="请输入毛重"
+              maxlength="20"
+              size="small"
+            />
+          </ws-form-item>
+
+          <!--皮重（吨）-->
+          <ws-form-item
+            label="皮重（吨）"
+            span="1"
+            prop="tare"
+            class="readonly"
           >
-            <ws-option
-              v-for="item in goodnameList"
-              :key="item.constKey"
-              :label="item.constValue"
-              :value="item.constValue"
+            <ws-input
+              @input="tarechange"
+              v-model="deptBudgetList.tare"
+              placeholder="请输入皮重"
+              maxlength="100"
+              size="small"
             />
-          </ws-select>
-        </ws-form-item>
-        <!--毛重（吨）-->
-        <ws-form-item label="毛重（吨）" span="1" prop="shippingType">
+          </ws-form-item>
+
+          <!--净重（吨）-->
+          <ws-form-item label="净重（吨）" span="1" prop="netWeight">
+            <ws-input
+              v-model.number="deptBudgetList.netWeight"
+              placeholder="不可编辑，自动计算"
+              type="number"
+              maxlength="120"
+              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">
+            <ws-input
+              v-model="deptBudgetList.agent"
+              placeholder="请输入出库经办人姓名"
+              maxlength="100"
+              size="small"
+            />
+          </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">
+            <ws-select
+              v-model="deptBudgetList.inOutType"
+              placeholder=""
+              class="typeselect"
+              @change="selectstorageType"
+            >
+              <ws-option
+                v-for="item in storageType"
+                :key="item.constKey"
+                :label="item.constValue"
+                :value="item.constValue"
+              />
+            </ws-select>
+          </ws-form-item>
+
+          <!--车牌号-->
+          <ws-form-item label="车牌号" span="1" prop="sourceGoods">
+            <ws-input
+              v-model="deptBudgetList.carNo"
+              placeholder="请输入车牌号"
+              maxlength="20"
+              size="small"
+            />
+          </ws-form-item>
+
+          <!--合同编号-->
+          <ws-form-item label="合同编号" span="1" prop="contractNo">
+            <ws-input
+              v-model="deptBudgetList.contractNo"
+              placeholder="请输入合同编号"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
+        </ws-info-table>
+      </div>
+      <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"
+      />
+      <h2>化验数据（选填）</h2>
+      <ws-info-table>
+        <!--自检员-->
+        <ws-form-item label="质检员" span="1" prop="qualityInspector">
           <ws-input
-            v-model="deptBudgetList.shippingType"
-            placeholder="请输入毛重"
-            maxlength="20"
+            v-model="deptBudgetList.warehouseInOutDetail.qualityInspector"
+            placeholder="请输入质检员姓名"
+            maxlength="120"
             size="small"
           />
         </ws-form-item>
 
-        <!--皮重（吨）-->
-        <ws-form-item label="皮重（吨）" span="1" prop="buyer" class="readonly">
+        <!--水分（%）<=-->
+        <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
           <ws-input
-            v-model="deptBudgetList.buyer"
-            placeholder="请输入皮重"
-            maxlength="100"
+            v-model="deptBudgetList.warehouseInOutDetail.waterContent"
+            placeholder="请输入水分占比"
+            maxlength="120"
             size="small"
           />
         </ws-form-item>
-
-        <!--净重（吨）-->
-        <ws-form-item label="净重（吨）" span="1" prop="settlementMethod">
+        <!--杂质（%）<=-->
+        <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
           <ws-input
-            v-model="deptBudgetList.settlementMethod"
-            placeholder="不可编辑，自动计算"
+            v-model="deptBudgetList.warehouseInOutDetail.impurity"
+            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="bulkDensity">
           <ws-input
-            v-model="deptBudgetList.seller"
-            placeholder="请输入出库经办人姓名"
-            maxlength="100"
+            v-model="deptBudgetList.warehouseInOutDetail.bulkDensity"
+            placeholder="请输入容重"
+            maxlength="120"
             size="small"
           />
         </ws-form-item>
-        <!--出库日期-->
-        <ws-form-item label="出库日期" span="1" prop="signingDate">
-          <ws-date-picker 
-            v-model="deptBudgetList.signingDate"
-            type="date"
-            placeholder="请选择出库日期"
-            value-format="yyyy-MM-dd"
+        <!--霉变粒（%）<=-->
+        <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" 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="jiaorenli">
           <ws-input
-            v-model="deptBudgetList.sourceGoods"
-            placeholder="请输入车牌号"
-            maxlength="20"
+            v-model="deptBudgetList.warehouseInOutDetail.jiaorenli"
+            placeholder="请输入热损伤占比"
+            maxlength="120"
             size="small"
           />
         </ws-form-item>
-
-        <!--合同编号-->
-        <ws-form-item label="合同编号" span="1" prop="contractNo">
+        <!--不完整粒（%）<=-->
+        <ws-form-item label="不完整粒（%）<=" span="1" prop="imperfectGrain">
           <ws-input
-            v-model.number="deptBudgetList.buyerPhone"
-            placeholder="请输入合同编号"
-            maxlength="100"
+            v-model="deptBudgetList.warehouseInOutDetail.imperfectGrain"
+            placeholder="请输入不完整粒占比"
+            maxlength="120"
             size="small"
           />
         </ws-form-item>
-
-        <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>
-      
-
+      </ws-info-table>
       <div style="text-align: right; padding: 10px">
         <el-button
           class="bg-bottom-up"
@@ -241,12 +242,11 @@
           >提交</el-button
         >
       </div>
-      </ws-form>
-    </div> 
+    </ws-form>
   </div>
 </template>
 <script>
-import { getList, export1, billoperatehis } from '@/model/contarct/index'
+import { pullDown, addstorageputList } from '@/model/warehouse/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -259,9 +259,9 @@ export default {
     Pagination,
   },
   watch: {
-    vesselId(val) {
-      this.getList()
-    },
+    // vesselId(val) {
+    //   this.getList()
+    // },
     isShow(val) {
       this.showType = val
     },
@@ -287,15 +287,24 @@ export default {
       contractType: 2,
       startDate: null,
       endDate: null,
-      goodnameList:{},
+      goodnameList: {},
       // 提交类型
       submitType: true,
-      selectpackingMethod:{},
-
-      appendixIdsAdd:{},
-      uploadSuccess:{},
-      onChange:{},
-
+      storageType: [],
+      appendixIdsAdd: '',
+      uploadSuccess: {},
+      onChange: {},
+      gradeList: [],
+      rules: {
+        netWeight: [
+          {
+            required: true,
+            type: 'number',
+            message: '请输入活动名称',
+            trigger: 'blur',
+          },
+        ],
+      },
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
@@ -305,7 +314,9 @@ export default {
         month: dayjs().format('MM'),
       },
       contractList: [],
-      deptBudgetList: {},
+      deptBudgetList: {
+        warehouseInOutDetail: {},
+      },
       historyList: [],
 
       pickerBeginDateBefore: {
@@ -316,13 +327,23 @@ export default {
       accessoryTFs: false,
     }
   },
-  activated() {
-    //cg.viewBudget
-    //cg.viewSpareMoney
-    // this.getVesselData();
+  mounted() {
+    console.log(this.$route.query)
+    this.deptBudgetList.baseId = this.$route.query.baseId
+    this.deptBudgetList.positionId = this.$route.query.positionId
+    this.deptBudgetList.warehouseName = this.$route.query.warehouseName
+    this.deptBudgetList.binNumber = this.$route.query.binNumber
     this.getList()
-    this.showType = this.isShow
   },
+  // activated() {
+  //   //cg.viewBudget
+  //   //cg.viewSpareMoney
+  //   // this.getVesselData();
+  //   console.log(2222)
+  //   this.getList()
+  //   console.log(1111)
+  //   this.showType = this.isShow
+  // },
   methods: {
     //返回按钮
     returnWarehouse() {
@@ -330,29 +351,56 @@ export default {
     },
     //提交按钮
     submit() {
-      this.$router.push({ path: 'warehouseManagementList' })
+      this.$refs.deptBudgetList.validate((valid) => {
+        if (valid) {
+          this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
+          this.deptBudgetList.inOutFlag = 1
+          addstorageputList(this.deptBudgetList)
+            .toPromise()
+            .then((response) => {
+              this.$message.success('添加成功')
+              this.$router.push({ path: 'warehouseManagementList' })
+            })
+        } else {
+          EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+          return false
+        }
+      })
+    },
+    tarechange(e) {
+      if (this.deptBudgetList.grossWeight && this.deptBudgetList.tare) {
+        this.deptBudgetList.netWeight = Number(
+          this.deptBudgetList.grossWeight - this.deptBudgetList.tare
+        )
+      }
+    },
+    grossWeightchange(e) {
+      if (this.deptBudgetList.grossWeight && this.deptBudgetList.tare) {
+        this.deptBudgetList.netWeight = Number(
+          this.deptBudgetList.grossWeight - this.deptBudgetList.tare
+        )
+      }
     },
-    dateFormat(fmt, date) {
-      let ret
-      const opt = {
-        'Y+': date.getFullYear().toString(), // 年
-        'm+': (date.getMonth() + 1).toString(), // 月
-        'd+': date.getDate().toString(), // 日
-        'H+': date.getHours().toString(), // 时
-        // "M+": date.getMinutes().toString(),         // 分
-        // "S+": date.getSeconds().toString()          // 秒
-        // 有其他格式化字符需求可以继续添加，必须转化成字符串
+    selectgoodsName(e) {
+      for (var i = 0; i < this.goodnameList.length; i++) {
+        if (this.goodnameList[i].constValue == e) {
+          this.deptBudgetList.goodsNameKey = this.goodnameList[i].constKey
+        }
       }
-      for (let k in opt) {
-        ret = new RegExp('(' + k + ')').exec(fmt)
-        if (ret) {
-          fmt = fmt.replace(
-            ret[1],
-            ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
-          )
+    },
+    selectpackingMethod(e) {
+      for (var i = 0; i < this.packtypeList.length; i++) {
+        if (this.packtypeList[i].constValue == e) {
+          this.deptBudgetList.packingMethodKey = this.packtypeList[i].constKey
+        }
+      }
+    },
+    selectstorageType(e) {
+      for (var i = 0; i < this.storageType.length; i++) {
+        if (this.storageType[i].constValue == e) {
+          this.deptBudgetList.inOutTypeKey = this.storageType[i].constKey
         }
       }
-      return fmt
     },
     handleClose() {
       this.accessoryTFs = false
@@ -368,32 +416,23 @@ export default {
       this.getList()
     },
     getList() {
-      getList({
-        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,
-        contrPage: this.contrPage,
-      })
+      // 货名
+      pullDown({ constId: 'CON2' })
+        .toPromise()
+        .then((response) => {
+          this.goodnameList = response
+        })
+      // 品级
+      pullDown({ constId: 'CON3' })
+        .toPromise()
+        .then((response) => {
+          this.gradeList = response
+        })
+      // 类型
+      pullDown({ constId: 'CON5' })
         .toPromise()
         .then((response) => {
-          for (var i = 0; i < response.records.length; i++) {
-            if (response.records[i].addressUrl != null) {
-              response.records[i].addressUrlArray = response.records[
-                i
-              ].addressUrl.split(',')
-            } else {
-              response.records[i].addressUrlArray = []
-            }
-          }
-          this.deptCircularPage.currentPage = response.current
-          this.deptCircularPage.pageSize = response.size
-          this.deptBudgetTotal = response.total
-          this.contractList = response
+          this.storageType = response
         })
     },
     selecttaskType(e) {
@@ -436,12 +475,7 @@ export default {
           this.historyList = response
         })
     },
-    find() {
-      this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
-      this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
-      this.currentPage = 1
-      this.getList()
-    },
+
     async exportlist() {
       const { data } = await export1(
         {
@@ -476,50 +510,77 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.container .bg-left {
-  margin-left: 40px;
+/deep/.basicInformation {
+  .ws-info-table {
+    border: none;
+  }
+  .el-form-item {
+    width: 33.3333%;
+    border: none;
+    .el-form-item__label {
+      background: transparent;
+      border: none;
+    }
+    .el-form-item__content {
+      border: none;
+    }
+  }
+}
+.title {
+  position: relative;
+  padding-left: 10px;
 }
-.container .bg-bottom {
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
   position: absolute;
-  float: right;
-  top: 15px;
-  right: 20px;
+  left: 0;
+}
+.el-form {
+  padding: 0 10%;
+}
+.el-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+}
+.el-col {
+  background: #f6f7fc;
+}
+.bg-right {
+  text-align: right;
+  padding: 16px 20px;
 }
 .center {
   position: relative;
   top: 50px;
-  width: 50%;
+  width: 40%;
   height: 2000px;
   margin: 0 auto;
 }
-
 /deep/.el-form-item__label {
   width: 160px;
 }
 /deep/.el-input--small {
   width: 70%;
 }
-.container .bg-bottom {
-  position: absolute;
-  float: right;
-  top: 15px;
-  right: 20px;
-}
 //选填
-/deep/.el-form-item{
+/deep/.el-form-item {
   width: 50%;
 }
 .container {
   overflow: scroll;
   height: 120vh;
 }
-/deep/.ws-info-table .el-form-item .el-form-item__label{
+/deep/.ws-info-table[data-v-850a44a6] .el-form-item .el-form-item__label {
   text-align: center;
 }
-.deliverydate{
+.deliverydate {
   width: 35%;
 }
-.center{
+.center[data-v-32a9842f] {
   margin-top: -60px;
 }
 </style>

src/views/warehouse/warehouseManagementEdit.vue

@@ -1,326 +1,154 @@
-<!--仓库修改-->
 <template>
   <div class="container">
     <el-row>
-      <el-col :span="12">
-        <h2 class="bg-left title">修改仓库</h2>
+      <el-col :span="20">
+        <h2 class="bg-left title">修改仓库信息</h2>
       </el-col>
-      <el-col :span="12" class="bg-right">
+      <el-col :span="4" class="bg-right">
         <el-button
           class="bg-bottom"
           type="primary"
           size="small"
-          @click="returnsales()"
-          ><img
-            width="6"
-            height="10"
-            style="vertical-align: bottom; margin-right: 3px"
-            src="../../../public/img/lujing.png"
-            alt=""
-          />返回</el-button
+          @click="returnWarehouse()"
+          >返回</el-button
         >
       </el-col>
     </el-row>
-
-    <ws-form
-      ref="deptBudgetList"
-      :rules="mainReportAdd"
-      :model="deptBudgetList"
-    >
-     
-      <ws-info-table>
-        <!--仓库名称-->
-        <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="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">
-          <ws-input
-            v-model="deptBudgetList.shippingType"
-            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"
+    <div class="center">
+      <ws-form ref="deptBudgetList" :model="deptBudgetList">
+        <!--基本信息-->
+        <ws-info-table>
+          <!--仓库名称-->
+          <ws-form-item
+            label="仓库名称"
+            span="1"
+            prop="warehouseName"
+            class="readonly"
           >
-            <el-option
-              v-for="(item, index) in unitList"
-              :key="item.constValue"
-              :label="item.constValue"
-              :value="item.constValue"
+            <ws-select
+              v-model="deptBudgetList.warehouseName"
+              placeholder=""
+              class="typeselect"
+              @change="selectpackingMethod"
             >
-              <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="buyer" class="readonly">
-          <ws-input
-            v-model="deptBudgetList.buyer"
-            placeholder="请输入详细地址"
-            maxlength="100"
-            size="small"
-          />
-        </ws-form-item>
-
-        <!--总吨量（吨）-->
-        <ws-form-item label="总吨量（吨）" span="1" prop="settlementMethod">
-          <ws-input
-            v-model="deptBudgetList.settlementMethod"
-            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-input
-            v-model.number="deptBudgetList.buyerPhone"
-            placeholder="请输入仓位最大容量"
-            maxlength="100"
-            size="small"
-          />
-        </ws-form-item>
-
-        <!--备注（选项）-->
-        <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="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-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="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-input
-            v-model="deptBudgetList.placeDelivery"
-            placeholder="请输入交货地"
-            maxlength="100"
-            size="small"
-          />
-        </ws-form-item>
-       
-      </ws-info-table>
-        <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-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">
+              <ws-option
+                v-for="item in packtypeList"
+                :key="item.constKey"
+                :label="item.warehouseName"
+                :value="item.warehouseName"
+              />
+            </ws-select>
+          </ws-form-item>
+          <!--负责人-->
+          <ws-form-item label="负责人" span="1" prop="personCharge">
+            <ws-input
+              v-model="deptBudgetList.personCharge"
+              placeholder="请输入负责人"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
+          <!--负责人电话-->
+          <ws-form-item label="负责人电话" span="1"  prop="personPhone" class="readonly">
+            <ws-input
+              v-model="deptBudgetList.personPhone"
+              placeholder="请输入负责人电话"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
+          <!--仓库所在地-->
+          <ws-form-item label="仓库所在地" span="1" prop="warehouseCity">
+            <ws-input
+              v-model="deptBudgetList.warehouseCity"
+              placeholder="请输入仓库所在地"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
+          <!--详细地址-->
+          <ws-form-item
+            label="详细地址"
+            span="1"
+            prop="detailedAddress"
+            class="readonly"
+          >
+            <ws-input
+              v-model="deptBudgetList.detailedAddress"
+              placeholder="请输入详细地址"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
+          <!--总储量（吨)-->
+          <ws-form-item label="总储量（吨)" span="1" prop="totalStorage">
+            <ws-input
+              v-model="deptBudgetList.totalStorage"
+              placeholder="请输入总储量（吨)"
+              maxlength="20"
+              size="small"
+            />
+          </ws-form-item>
+        </ws-info-table>
+        <div v-for="item in deptBudgetList.warehousePositionInfoList">
+          <ws-info-table>
+            <!--仓位编号-->
+            <ws-form-item label="仓位编号" span="1" prop="binNumber">
+              <ws-input
+                v-model.number="item.binNumber"
+                placeholder="请输入仓位编号"
+                maxlength="100"
+                size="small"
+              />
+            </ws-form-item>
+            <!--仓位储量（吨）-->
+            <ws-form-item label="仓位储量（吨）" span="1" prop="maxStorage">
+              <ws-input
+                v-model="item.maxStorage"
+                placeholder="请输入仓位储量（吨）"
+                maxlength="20"
+                size="small"
+              />
+            </ws-form-item>
+            <!--备注（选填）-->
+            <ws-form-item label="备注（选填）" span="1" prop=" remark">
+              <ws-input
+                v-model="item.remark"
+                placeholder="请输入备注"
+                maxlength="100"
+                size="small"
+              />
+            </ws-form-item>
+          </ws-info-table>
+        </div>
+      </ws-form>
+    </div>
+    <div style="text-align: right; padding: 10px">
       <el-button
-        class="bg-bottom"
+        class="bg-bottom-up"
         type="primary"
         size="small"
-        @click="submit(deptBudgetList)"
-        >提交</el-button
+        @click="submit()"
+        >修改</el-button
       >
-
-      
     </div>
-
   </div>
 </template>
 <script>
-//  import { getVesselOne } from '@/model/procurement/basic'
-//  import { dayjs } from 'base-core-lib'
-import {
-  packList,
-  addList,
-  xiala,
-  addxiala,
-  editxiala,
-  delxiala,
-} from '@/model/contarct/index'
+import { xiala, billoperatehis, getLook, edit } from '@/model/warehouse/index'
+import { downloadFile } from '@/utils/batchDown'
+import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
-
+import { dayjs, fmoney, EventBus } from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
   components: {
     WsUpload,
+    Pagination,
   },
   watch: {
     vesselId(val) {
-      this.getVesselData()
+      this.getList()
     },
     isShow(val) {
       this.showType = val
@@ -339,125 +167,96 @@ export default {
       showType: true,
       // 年
       year: '',
+      deptBudgetTotal: 0,
+      currentPage: 1,
+      pageSize: 10,
+      searchType: 1,
+      searchKeyWord: '',
+      contractType: 2,
+      startDate: null,
+      endDate: null,
+      unitList: [],
       // 提交类型
       submitType: true,
-      tableData: [{ date: 1111, name: 'qqqq', address: 'errrtt' }],
-
-      packtypeList: [],
-      compId: sessionStorage.getItem('ws-pf_compId'),
-      mainReportAdd: {},
-      appendixIdsAdd: '',
       size: 10,
-      // uploadSuccess: {},
-      // onChange:{},
-      unitList: [],
-      goodnameList: [],
-      value1: '袋装',
-      value2: '未回收',
-      gradeList: [],
-      ChapterTwoList: [],
-
-      deptBudgetList: {
-        contractGoodsInfo: {
-          goodsName: '',
-        },
-        contractProcessInfo: {},
+      compId: sessionStorage.getItem('ws-pf_compId'),
+      deptCircularPage: {},
+      packtypeList: [],
+      date: {
+        year: dayjs().format('YYYY'),
+        month: dayjs().format('MM'),
       },
+      contractList: [],
+      deptBudgetList: {},
+      historyList: [],
 
       pickerBeginDateBefore: {
         disabledDate: (time) => {
           return time.getTime() > Date.now()
         },
       },
-      // selectpackingMethod: {},
-      // selectgrade: {},
-      // selectunitList: {},
-      // selectDuty: {},
-      // isEdited: false,
-      // registered: {},
-      // selectCrtDuty: {},
-      // dutyList: {},
-      // sexList: {},
-      ruleDeptBudget: {
-        contractNo: [
-          { required: true, message: '请输入活动名称', trigger: 'blur' },
-          {
-            min: 6,
-            max: 20,
-            message: '长度在 6 到 20 个字符',
-            trigger: 'blur',
-          },
-        ],
-      },
-      selectIntendedShip: {},
-      interviewTypeList: {},
+      accessoryTFs: false,
     }
   },
   activated() {
-    //cg.viewBudget
-    //cg.viewSpareMoney
-    // this.getVesselData();
-    this.deptBudgetList.packingMethod = '袋装'
-    this.deptBudgetList.packingMethodKey = 2
-    this.deptBudgetList.contractGoodsInfo.goodsName = '玉米'
-    this.deptBudgetList.contractGoodsInfo.goodsNameKey = 1
-    this.deptBudgetList.contractProcessInfo.grade = '未回收'
-    this.deptBudgetList.contractProcessInfo.gradeKey = 1
     this.loaddata()
     this.showType = this.isShow
   },
   methods: {
-    // 关闭 dialog时 处理文件url 初始化upload组件
+    //返回按钮
+    returnWarehouse() {
+      this.$router.push({ path: 'warehouseManagementList' })
+    },
+    dateFormat(fmt, date) {
+      let ret
+      const opt = {
+        'Y+': date.getFullYear().toString(), // 年
+        'm+': (date.getMonth() + 1).toString(), // 月
+        'd+': date.getDate().toString(), // 日
+        'H+': date.getHours().toString(), // 时
+        // "M+": date.getMinutes().toString(),         // 分
+        // "S+": date.getSeconds().toString()          // 秒
+        // 有其他格式化字符需求可以继续添加，必须转化成字符串
+      }
+      for (let k in opt) {
+        ret = new RegExp('(' + k + ')').exec(fmt)
+        if (ret) {
+          fmt = fmt.replace(
+            ret[1],
+            ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
+          )
+        }
+      }
+      return fmt
+    },
     handleClose() {
-      this.dialogViewSpareMoney = false
+      this.accessoryTFs = false
     },
-    returnsales() {
-      this.$router.push({ path: 'warehouseManagementList' })
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
+    selectpackingMethod(e) {
+      console.log(e)
+      for (var i = 0; i < this.packtypeList.length; i++) {
+        if (this.packtypeList[i].warehouseName == e) {
+          this.getLook(this.packtypeList[i].id)
+        }
+      }
     },
     loaddata() {
-      // 包装方式
-      packList({ constId: 'CON1' })
+      // 仓库名称
+      xiala({ compId: sessionStorage.getItem('ws-pf_compId') })
         .toPromise()
         .then((response) => {
           this.packtypeList = response
         })
-      // 验收方式
-      this.getUnitList()
-      // 货名
-      packList({ constId: 'CON2' })
-        .toPromise()
-        .then((response) => {
-          this.goodnameList = response
-        })
-      // 品级
-      packList({ constId: 'CON3' })
-        .toPromise()
-        .then((response) => {
-          this.gradeList = response
-        })
-      // 双章
-      packList({ constId: 'CON4' })
-        .toPromise()
-        .then((response) => {
-          this.ChapterTwoList = response
-        })
-    },
-    // 上传附件
-    uploadSuccess(data, files, url) {
-      console.log(data, files, url)
-
-      // this.deptBudgetList.
-      // this.formData.append('files', files)
-      // this.feedbackObj.uploadNameAttachment = data.appendixName
-      // this.feedbackObj.pathUploadAttachment = data.appendixPath
-      // // this.newAppendixs = files
-      // this.onChangeFlag = true
-    },
-    onChange(files) {
-      this.fileNum = files
-      this.$refs.upload.handleSaveBill().then((res) => {
-        console.log(files)
-      })
     },
     getUnitList() {
       xiala({
@@ -472,756 +271,89 @@ export default {
             item.flag = 'delete'
             if (this.vModel == item.constKey) {
               currItem = item
+              this.getLook(currItem.compId)
             }
           })
           //
           if (currItem) {
-            this.selectContract(currItem.constValue)
+            this.getLook(currItem.compId)
           }
         })
     },
-
-    submit() {
-      if (!this.deptBudgetList.contractNo) {
-        this.$message({
-          message: '请输入合同编号',
-          type: 'warning',
-        })
-        return
-      }
-      console.log(this.deptBudgetList.contractNo.length)
-      if (
-        this.deptBudgetList.contractNo.length < 6 ||
-        this.deptBudgetList.contractNo.length > 20
-      ) {
-        this.$message({
-          message: '合同编号长度不符合要求,请输入6到20个字符之内！',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.deptBudgetList.shippingType) {
-        this.$message({
-          message: '请输入运输方式！',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        this.deptBudgetList.shippingType.length < 1 ||
-        this.deptBudgetList.shippingType.length > 20
-      ) {
-        this.$message({
-          message: '运输方式长度不符合要求,请输入1到20个字符之内！',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.deptBudgetList.buyer) {
-        this.$message({
-          message: '请输入买方名称！',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        this.deptBudgetList.buyer.length < 4 ||
-        this.deptBudgetList.buyer.length > 30
-      ) {
-        this.$message({
-          message: '买方名称长度不符合要求,请输入4到30个字符之内！',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.deptBudgetList.seller) {
-        this.$message({
-          message: '请输入卖方名称！',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        this.deptBudgetList.seller.length < 4 ||
-        this.deptBudgetList.seller.length > 30
-      ) {
-        this.$message({
-          message: '卖方名称长度不符合要求,请输入4到30个字符之内！',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.deptBudgetList.buyerPhone) {
-        this.$message({
-          message: '请输入买方电话！',
-          type: 'warning',
-        })
-        return
-      }
-      if (isNaN(this.deptBudgetList.buyerPhone)) {
-        this.$message({
-          message: '输入买方电话有误!',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        this.deptBudgetList.buyerPhone.length < 7 ||
-        this.deptBudgetList.buyerPhone.length > 20
-      ) {
-        this.$message({
-          message: '买方电话长度不符合要求,请输入7到20个字符之内！',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.deptBudgetList.sellerPhone) {
-        this.$message({
-          message: '请输入卖方电话！',
-          type: 'warning',
-        })
-        return
-      }
-      if (isNaN(this.deptBudgetList.sellerPhone)) {
-        this.$message({
-          message: '输入卖方电话有误！',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        this.deptBudgetList.buyerPhone.length < 7 ||
-        this.deptBudgetList.buyerPhone.length > 20
-      ) {
-        this.$message({
-          message: '卖方电话长度不符合要求,请输入7到20个字符之内！',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.deptBudgetList.settlementMethod) {
-        this.$message({
-          message: '请输入结算方式！',
-          type: 'warning',
-        })
-        return
-      }
-
-      if (!this.deptBudgetList.sourceGoods) {
-        this.$message({
-          message: '请输入货源地！',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.deptBudgetList.placeDelivery) {
-        this.$message({
-          message: '请输入交货地！',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.deptBudgetList.weight) {
-        this.$message({
-          message: '请输入重量！',
-          type: 'warning',
+    getLook(compId1) {
+      getLook({
+        id: compId1,
+      })
+        .toPromise()
+        .then((response) => {
+          this.deptBudgetList = response
         })
-        return
-      }
+    },
 
-      if (
-        isNaN(this.deptBudgetList.weight) ||
-        /\.\d{3}$/.test(this.deptBudgetList.weight) == false ||
-        this.deptBudgetList.weight < 0 ||
-        this.deptBudgetList.weight > 200000
-      ) {
-        this.$message({
-          message: '输入重量有误！',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        !this.deptBudgetList.overShort &&
-        isNaN(this.deptBudgetList.overShort)
-      ) {
-        this.$message({
-          message: '溢短装输入有误！',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        !this.deptBudgetList.unitContractPrice &&
-        isNaN(this.deptBudgetList.unitContractPrice)
-      ) {
-        this.$message({
-          message: '合同单价输入有误！',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        !this.deptBudgetList.totalContractPrice &&
-        isNaN(this.deptBudgetList.totalContractPrice)
-      ) {
-        this.$message({
-          message: '合同总价输入有误！',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.deptBudgetList.deliveryDateStart) {
-        this.$message({
-          message: '请选择交货日期（起）',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.deptBudgetList.deliveryDateEnd) {
-        this.$message({
-          message: '请选择交货日期（止）',
-          type: 'warning',
-        })
-        return
-      }
-      //时间
-      if (
-        new Date(this.deptBudgetList.deliveryDateStart).getTime() >
-        new Date(this.deptBudgetList.deliveryDateEnd).getTime()
-      ) {
-        this.$message({
-          message: '交货日期（止）选择错误',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.deptBudgetList.signingDate) {
-        this.$message({
-          message: '请选择签订日期',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.deptBudgetList.contractGoodsInfo.goodsName) {
-        this.$message({
-          message: '请选择货名',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.deptBudgetList.contractGoodsInfo.waterContent) {
-        this.$message({
-          message: '请选择水分',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.deptBudgetList.contractGoodsInfo.grade) {
-        this.$message({
-          message: '请选择品级',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        !this.deptBudgetList.contractGoodsInfo.impurity ||
-        /\.\d{2}$/.test(this.deptBudgetList.contractGoodsInfo.impurity)
-      ) {
-        this.$message({
-          message: '杂质输入错误',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        !this.deptBudgetList.contractGoodsInfo.bulkDensity ||
-        /\.\d{2}$/.test(this.deptBudgetList.contractGoodsInfo.bulkDensity)
-      ) {
-        this.$message({
-          message: '容重输入错误',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        !this.deptBudgetList.contractGoodsInfo.mildewGrain ||
-        /\.\d{2}$/.test(this.deptBudgetList.contractGoodsInfo.mildewGrain)
-      ) {
-        this.$message({
-          message: '霉变粒输入错误',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        !this.deptBudgetList.contractGoodsInfo.jiaorenli ||
-        /\.\d{2}$/.test(this.deptBudgetList.contractGoodsInfo.jiaorenli)
-      ) {
-        this.$message({
-          message: '热损伤输入错误',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        !this.deptBudgetList.contractGoodsInfo.imperfectGrain ||
-        /\.\d{2}$/.test(this.deptBudgetList.contractGoodsInfo.imperfectGrain)
-      ) {
-        this.$message({
-          message: '不完整粒输入错误',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        (!this.deptBudgetList.contractProcessInfo.goodsNameKey > 1000000000) |
-          (this.deptBudgetList.contractProcessInfo.goodsNameKey < 0) ||
-        /\.\d{2}$/.test(this.deptBudgetList.contractProcessInfo.goodsNameKey) ==
-          false
-      ) {
-        this.$message({
-          message: '合同收入金额输入错误',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        (!this.deptBudgetList.contractProcessInfo.waterContent > 10000000) |
-          (this.deptBudgetList.contractProcessInfo.waterContent < 0) ||
-        /\.\d{2}$/.test(this.deptBudgetList.contractProcessInfo.waterContent) ==
-          false
-      ) {
-        this.$message({
-          message: '费用金额输入错误',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        (!this.deptBudgetList.contractProcessInfo.mildewGrain > 1000000000) |
-          (this.deptBudgetList.contractProcessInfo.mildewGrain < 0) ||
-        /\.\d{2}$/.test(this.deptBudgetList.contractProcessInfo.mildewGrain) ==
-          false
-      ) {
-        this.$message({
-          message: '未回款金额输入错误',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        (!this.deptBudgetList.contractProcessInfo.goodsName > 1000000000) |
-          (this.deptBudgetList.contractProcessInfo.goodsName < 0) ||
-        /\.\d{2}$/.test(this.deptBudgetList.contractProcessInfo.goodsName) ==
-          false
-      ) {
-        this.$message({
-          message: '已开发票金额输入错误',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        (!this.deptBudgetList.contractProcessInfo.impurity > 1000000000) |
-          (this.deptBudgetList.contractProcessInfo.impurity < 0) ||
-        /\.\d{2}$/.test(this.deptBudgetList.contractProcessInfo.impurity) ==
-          false
-      ) {
-        this.$message({
-          message: '未开发票金额输入错误',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        (!this.deptBudgetList.contractProcessInfo.imperfectGrain > 200000) |
-          (this.deptBudgetList.contractProcessInfo.imperfectGrain < 0) ||
-        /\.\d{3}$/.test(
-          this.deptBudgetList.contractProcessInfo.imperfectGrain
-        ) == false
-      ) {
-        this.$message({
-          message: '已完成发运量输入错误',
-          type: 'warning',
-        })
-        return
-      }
+    //提交
+    submit() {
       this.$refs.deptBudgetList.validate((valid) => {
         if (valid) {
           this.deptBudgetList.compId = this.compId
-          this.deptBudgetList.contractType = 2
-          addList(this.deptBudgetList)
+          this.deptBudgetList.contractType = 1
+          edit(this.deptBudgetList)
             .toPromise()
             .then((response) => {
-              this.$message.success('添加成功')
-              this.$router.push({ path: 'salesContract' })
+              this.$message.success('编辑成功')
+              this.$router.push({ path: 'warehouseManagementList' })
             })
         } else {
-          EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+          //EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
           return false
         }
       })
     },
-    resetForm(deptBudgetList) {
-      this.$refs[deptBudgetList].resetFields()
-    },
-    saveClick(item, index) {
-      console.log(item)
-
-      if (Object.is(item.id, 1)) {
-        return
-      }
-      if (Object.is(this.unitList[index].flag, 'delete')) {
-        this.$set(this.unitList, index, { flag: 'check' })
-      } else {
-        this.$set(this.unitList, index, { flag: 'delete' })
-      }
-      if (!item.constValue) {
-        this.unitList.splice(index, 1)
-        return
-      }
-      if (item.flag == 'add') {
-        item.constKey = Math.random() * 20
-        this.trainingMethods.compId = sessionStorage.getItem('ws-pf_compId')
-        this.trainingMethods.constKey = item.constKey
-        this.trainingMethods.constCode = 'TYPEYAN'
-        this.trainingMethods.constValue = item.constValue
-        this.trainingMethods.id = item.id
-        addxiala(this.trainingMethods)
-          .toPromise()
-          .then((response) => {
-            this.getUnitList()
-          })
-      } else if (item.flag == 'check') {
-        this.trainingMethods.compId = sessionStorage.getItem('ws-pf_compId')
-        this.trainingMethods.constKey = item.constKey
-        this.trainingMethods.constCode = 'TYPEYAN'
-        this.trainingMethods.constValue = item.constValue
-        this.trainingMethods.id = item.id
-        editxiala(this.trainingMethods)
-          .toPromise()
-          .then((response) => {
-            this.getUnitList()
-          })
-      }
-    },
-    // selectContract(val) {
-    //   let key = this.unitList.find((item) => item.constValue === val).constKey
-    //   this.pleaseChoose = val
-    // },
-
-    handleExamine() {},
-    approve() {},
-    // returnsales() {
-    //   this.$router.push({ path: 'purchaseContract' })
-    // },
-    selectChapterTwo(e) {
-      for (var i = 0; i < this.ChapterTwoList.length; i++) {
-        if (this.ChapterTwoList[i].constValue == e) {
-          this.deptBudgetList.gradeKey = this.ChapterTwoList[i].constKey
-        }
-      }
-    },
-    selectunitList(e) {
-      for (var i = 0; i < this.unitList.length; i++) {
-        if (this.unitList[i].constValue == e) {
-          this.deptBudgetList.acceptanceMethodKey = this.unitList[i].constKey
-        }
-      }
-    },
-    selectgrade(e) {
-      for (var i = 0; i < this.gradeList.length; i++) {
-        if (this.gradeList[i].constValue == e) {
-          this.deptBudgetList.gradeKey = this.gradeList[i].constKey
-        }
-      }
-    },
-    selectgoodsName(e) {
-      for (var i = 0; i < this.goodnameList.length; i++) {
-        if (this.goodnameList[i].constValue == e) {
-          this.deptBudgetList.goodsNameKey = this.goodnameList[i].constKey
-        }
-      }
-    },
-    selectpackingMethod(e) {
-      for (var i = 0; i < this.packtypeList.length; i++) {
-        if (this.packtypeList[i].constValue == e) {
-          this.deptBudgetList.packingMethodKey = this.packtypeList[i].constKey
-        }
-      }
-    },
-    // 编辑
-    editClick(item, index) {
-      const map = JSON.parse(JSON.stringify(item))
-      if (Object.is(item.id, 1)) {
-        return
-      }
-      if (Object.is(this.unitList[index].flag, 'delete')) {
-        map.flag = 'check'
-        this.$set(this.unitList, index, map)
-      } else {
-        map.flag = 'delete'
-        this.$set(this.unitList, index, map)
-      }
+   
+    // 关闭 dialog时 处理文件url 初始化upload组件
+    handleCloe() {
+      this.dialogViewSpareMoney = false
     },
-    // 删除
-    deleteClick(item, index) {
-      if (Object.is(item.constKey, 1)) {
-        return
-      }
-      if (!item.constValue) {
-        this.unitList.splice(index, 1)
-        return
-      }
-      delxiala({ id: this.unitList[index].id })
+    history(row) {
+      console.log(row)
+      billoperatehis({ id: row.id })
         .toPromise()
         .then((response) => {
-          this.getUnitList()
-          this.pleaseChoose = ''
+          this.historyList = response
         })
     },
+    //删除
+
+    approve() {},
+    listQuery() {},
+    total() {},
+    clearfiltQuery() {},
+    selectCrtDuty() {},
   },
 }
 </script>
-
 <style lang="scss" scoped>
-.el-form {
-  padding: 0 15%;
-}
-/deep/.ws-info-table .el-form-item {
-  border-right: 1px solid #cdd2dc;
-  border-bottom: 1px solid #cdd2dc;
-}
-.readonly {
+.center {
   position: relative;
+  margin-top: 100px;
+  top: 100px;
+  width: 90%;
+  height: 500px;
+  margin: 0 auto;
 }
-.readonly:after {
-  content: '*';
-  color: #ff2727;
-  position: absolute;
-  right: 8px;
-  z-index: 10;
-  top: 21%;
-  font-size: 20px;
-}
-.title {
-  position: relative;
+.container .bg-left {
+  margin-left: 40px;
 }
-.title::before {
-  content: '';
-  display: inline-block;
-  width: 5px;
-  height: 30px;
-  background: #5473e8;
+.container .bg-bottom {
   position: absolute;
-  left: 0;
-}
-.el-button--primary {
-  background-color: #5878e8;
-  border-color: #5878e8;
-}
-.el-col {
-  background: #f6f7fc;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  padding: 0 25px;
-  border-left: 1px solid #cdd2dc;
-  background: #fafbfc;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  width: 140px;
-  text-align: center;
-  background: #f0f2f6;
-  // border: 1px solid #cdd2dc;
-}
-.button-container {
-  display: flex;
-  flex-wrap: nowrap;
-  justify-content: space-between;
-  align-items: center;
-  background-color: #fff;
-  width: 100%;
-  height: 50px;
-  padding: 0 10px;
-  & > div {
-    margin-left: 10px;
-    display: flex;
-    flex-wrap: nowrap;
-    flex-direction: row;
-    & > span {
-      line-height: 50px;
-    }
-  }
-
-  /deep/.auditFlow-box {
-    position: unset;
-    margin-left: 10px;
-    &/deep/.auditFlow-icon {
-      width: auto;
-      padding-right: 30px;
-    }
-    &/deep/.auditFlow-main {
-      position: absolute;
-    }
-  }
-}
-.box-app {
-  display: inline-block;
-  float: left;
-  margin-left: 30px;
-  line-height: 50px;
-}
-/deep/.el-dialog {
-  .el-form-item {
-    margin-bottom: 0 !important;
-    .el-input--medium {
-      textarea {
-        min-height: 100px !important;
-      }
-    }
-  }
+  float: right;
+  top: 15px;
+  right: 20px;
 }
-.collapse-bottom {
-  margin-bottom: 20px;
-}
-.input-main .textarea .el-textarea__inner {
-  width: 100%;
-  z-index: 1;
-}
-.bg-left {
-  padding-left: 30px;
-}
-.bg-right {
-  padding-right: 10px;
+.vertical-text-left {
+  width: 62px;
   text-align: right;
 }
-.bg-bottom {
-  margin: 15px 0px;
-}
-.wenzi {
-  width: 900px;
-  margin: 0 auto;
-}
-.wenzi h3 {
-  display: inline-block;
-  left: 10px;
-}
-.wenzi p {
-  display: inline-block;
-}
-.center {
-  width: 900px;
-  margin: 0 auto;
-}
-.el-form-item {
-  width: 50%;
-}
-.el-form-item__label {
-  text-align: center;
-}
-.ce {
-  width: 900px;
-  margin: 0 auto;
-}
-/*.crt-main .textarea /deep/ .el-form-item__label {*/
-/*  height: 82px;*/
-/*}*/
-// 控制select为只读的时候显示样式
-
-.hide-sel {
-  .el-input__inner {
-    border: 0px;
-  }
-  .el-icon-arrow-up {
-    display: none;
-  }
-  .el-textarea__inner {
-    background-color: #fff !important;
-    border: 0;
-  }
-  .el-date-editor {
-    i {
-      display: none;
-    }
-  }
-  .is-disabled {
-    .el-input__inner:hover {
-      background-color: #fff !important;
-      border: 0;
-    }
-    color: #606266;
-    .el-input__inner {
-      background-color: #fff !important;
-      border: 0;
-      color: #606266;
-    }
-    .el-textarea__inner {
-      background-color: #fff !important;
-      border: 0;
-      color: #606266;
-    }
-  }
-}
-
-// 控制select为只读的时候显示样式
-/deep/.ws-class-table-col {
-  height: auto;
-  padding: 0px 2px;
-  /deep/.el-input__inner {
-    padding: 0px 2px;
-  }
-}
-/deep/.is-disabled {
-  .el-input__prefix,
-  .el-input__suffix {
-    display: none;
-  }
-  .el-input__inner {
-    background-color: #fff;
-    border-color: #fff !important;
-    color: #000 !important;
-    font-size: 14px;
-    cursor: text;
-    padding: 0 !important;
-  }
-}
-.winseaview-view {
-  padding: 0 0 20px;
-}
-.container {
-  overflow: scroll;
-  height: 93vh;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  width: 130px;
-}
-.ws-info-table .el-form-item{
-  width: 30%;
-}
-.readonly :after{
-  display: none;
-}
-.el-textarea__inner{
-  display: none;
-}
-.el-form{
-  margin-top: 50px;
-}
-.readonly{
-  width: 16%;
-}
-.readonly :after{
-  display: none;
-}
-.ws-info-table{
-  margin-top: 50px;
-}
-.ws-info-table .el-form-item{
+/deep/.el-form-item {
   width: 33.33%;
 }
-.readonly{
-  display: none;
-}
-
-</style>
+</style>

src/views/warehouse/warehouseManagementIoss.vue

@@ -20,7 +20,6 @@
         <!-- 货名 -->
         <ws-form-item label="货名" span="1"  class="readonly">
           <ws-select
-           
             placeholder=""
             class="typeselect"
             @change="selectpackingMethod"
@@ -28,8 +27,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>
@@ -119,10 +118,9 @@
 </template>
 <script>
 import {
-  getList,
-  export1,
-  billoperatehis,
-} from '@/model/contarct/index'
+  goodsname,
+} from '@/model/warehouse/index'
+
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -166,6 +164,7 @@ export default {
       // 提交类型
       submitType: true,
       selectpackingMethod: {},
+      goodnameList:[],
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
@@ -190,7 +189,7 @@ export default {
     //cg.viewBudget
     //cg.viewSpareMoney
     // this.getVesselData();
-    this.getList()
+    this.loaddata()
     this.showType = this.isShow
   },
   methods: {
@@ -237,63 +236,50 @@ export default {
       console.log(`当前页: ${val}`)
       this.getList()
     },
-    getList() {
-      getList({
-        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,
-        contrPage: this.contrPage,
-      })
+     loaddata() {
+      // 货名
+      goodsname({ constId: 'CON2' })
         .toPromise()
         .then((response) => {
-          for (var i = 0; i < response.records.length; i++) {
-            if (response.records[i].addressUrl != null) {
-              response.records[i].addressUrlArray = response.records[
-                i
-              ].addressUrl.split(',')
-            } else {
-              response.records[i].addressUrlArray = []
-            }
-          }
-          this.deptCircularPage.currentPage = response.current
-          this.deptCircularPage.pageSize = response.size
-          this.deptBudgetTotal = response.total
-          this.contractList = response
+          this.goodnameList = response
         })
     },
+    // getList() {
+    //   getList({
+    //     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,
+    //     contrPage: this.contrPage,
+    //   })
+    //     .toPromise()
+    //     .then((response) => {
+    //       for (var i = 0; i < response.records.length; i++) {
+    //         if (response.records[i].addressUrl != null) {
+    //           response.records[i].addressUrlArray = response.records[
+    //             i
+    //           ].addressUrl.split(',')
+    //         } else {
+    //           response.records[i].addressUrlArray = []
+    //         }
+    //       }
+    //       this.deptCircularPage.currentPage = response.current
+    //       this.deptCircularPage.pageSize = response.size
+    //       this.deptBudgetTotal = response.total
+    //       this.contractList = response
+    //     })
+    // },
     selecttaskType(e) {
       for (var i = 0; i < this.taskTypeList.length; i++) {
         if (this.taskTypeList[i].value == e) {
           this.searchType = this.taskTypeList[i].type
         }
       }
-    },
-    fujian(row) {
-      if (
-        row.receiveAttachmentPath === null ||
-        row.receiveAttachmentPath === ''
-      ) {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
-      } else {
-        this.accessoryTFs = true
-      }
-      this.appendixIdss = row.receiveAttachmentPath
-    },
-    handleExamine(row) {
-      this.$router.push({
-        name: 'salesContractExamine',
-        query: { id: row.id },
-      })
-    },
-
+    },  
     // 关闭 dialog时 处理文件url 初始化upload组件
     handleCloe() {
       this.dialogViewSpareMoney = false
@@ -306,35 +292,7 @@ export default {
           this.historyList = response
         })
     },
-    find() {
-      this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
-      this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
-      this.currentPage = 1
-      this.getList()
-    },
-    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() {},

src/views/warehouse/warehouseManagementList.vue

@@ -78,40 +78,73 @@
         </el-table-column>
         <el-table-column prop="binNumber" label="仓位编号" width="80">
         </el-table-column>
-        <el-table-column prop="capacity" label="容量（吨）"> </el-table-column>
-        <el-table-column prop="inNetWeight" label="入库量（吨）">
+        <el-table-column prop="capacity" label="容量（吨）">
+          <template slot-scope="scope">
+            <div
+              v-if="scope.row.capacity != 'null' && scope.row.capacity != null"
+            >
+              {{ scope.row.capacity }}
+            </div>
+          </template>
         </el-table-column>
-        <el-table-column prop="outNetWeight" label="出库量（吨）">
+        <el-table-column label="品种">
+          <template slot-scope="scope">
+            <div v-for="(item, i) in scope.row.warehouseNumViewList">
+              {{ item.goodsName }}
+            </div>
+          </template>
         </el-table-column>
-        <el-table-column prop="storage" label="应余量（吨）"> </el-table-column>
-        <el-table-column prop="seller" label="出入库" width="160">
-          <button
-            type="primary"
-            @click="nocomplete()"
-            v-hasPermission="
-              `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-            "
-          >
-            待完成
-          </button>
-          <button
-            type="primary"
-            @click="delivery()"
-            v-hasPermission="
-              `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-            "
-          >
-            出库
-          </button>
-          <button
-            type="primary"
-            @click="warehousing()"
-            v-hasPermission="
-              `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-            "
-          >
-            入库
-          </button>
+        <el-table-column label="入库量（吨）">
+          <template slot-scope="scope">
+            <div v-for="(item, i) in scope.row.warehouseNumViewList">
+              {{ item.inNetWeight }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="出库量（吨）">
+          <template slot-scope="scope">
+            <div v-for="(item, i) in scope.row.warehouseNumViewList">
+              {{ item.outNetWeight }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="应余量（吨）">
+          <template slot-scope="scope">
+            <div v-for="(item, i) in scope.row.warehouseNumViewList">
+              {{ item.storage }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="seller" label="出入库" width="300">
+          <template slot-scope="scope">
+            <ws-button
+              type="primary"
+              @click="nocomplete()"
+              v-hasPermission="
+                `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+              "
+            >
+              待完成（{{ scope.row.number }}）
+            </ws-button>
+            <ws-button
+              type="primary"
+              @click="warehousing(scope.row)"
+              v-hasPermission="
+                `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+              "
+            >
+              入库
+            </ws-button>
+            <ws-button
+              type="primary"
+              @click="delivery(scope.row)"
+              v-hasPermission="
+                `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+              "
+            >
+              出库
+            </ws-button>
+          </template>
         </el-table-column>
         <el-table-column prop="address" label="操作" width="200">
           <!-- <template slot-scope="scope"> -->
@@ -188,6 +221,7 @@ export default {
       // 提交类型
       submitType: true,
       size: 10,
+      spanArr: [],
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
       date: {
@@ -214,12 +248,62 @@ export default {
   },
   methods: {
     //出库
-    delivery() {
-      this.$router.push({ path: 'warehouseManagementDelivery' })
+    delivery(item) {
+      this.$router.push({
+        path: 'warehouseManagementDelivery',
+        query: {
+          baseId: item.warehouseId,
+          positionId: item.binNumberId,
+          warehouseName: item.warehouseName,
+          binNumber: item.binNumber,
+        },
+      })
     },
     //入库
-    warehousing() {
-      this.$router.push({ path: 'warehouseManagementPut' })
+    warehousing(item) {
+      this.$router.push({
+        path: 'warehouseManagementPut',
+        query: {
+          baseId: item.warehouseId,
+          positionId: item.binNumberId,
+          warehouseName: item.warehouseName,
+          binNumber: item.binNumber,
+        },
+      })
+    },
+    getSpanArr(data) {
+      let that = this
+
+      //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
+
+      that.spanArr = []
+
+      that.pos = 0
+
+      //遍历数据
+
+      data.forEach((item, index) => {
+        //判断是否是第一项
+
+        // if (index === 0) {
+        //   this.spanArr.push(1)
+        //   this.pos = 0
+        // } else {
+        //不是第一项时，就根据标识去存储
+        console.log(data[index].warehouseNumViewList.length)
+        if (data[index].warehouseNumViewList.length > 1) {
+          // 查找到符合条件的数据时每次要把之前存储的数据+1
+          this.spanArr[this.pos] = data[index].warehouseNumViewList.length
+          this.spanArr.push(0)
+        } else {
+          // 没有符合的数据时，要记住当前的index
+
+          this.spanArr.push(1)
+
+          this.pos = index
+        }
+        // }
+      })
     },
     //待完成
     nocomplete() {
@@ -231,7 +315,12 @@ export default {
     },
     //盘损
     loss() {
-      this.$router.push({ path: 'warehouseManagementIoss' })
+      // console.log(row.positionId)
+      // this.$router.push({
+      //   name: 'warehouseManagementIoss',
+      //   params: {positionId: row.positionId },
+      // })
+       this.$router.push({ path: 'warehouseManagementIoss' })
     },
     //查看
     handleLook() {
@@ -289,6 +378,7 @@ export default {
       })
         .toPromise()
         .then((response) => {
+          this.getSpanArr(response)
           // for (var i = 0; i < response.records.length; i++) {
           //   if (response.records[i].addressUrl != null) {
           //     response.records[i].addressUrlArray = response.records[

src/views/warehouse/warehouseManagementLook.vue

@@ -32,7 +32,7 @@
               @change="selectpackingMethod"
             >
               <ws-option
-                v-for="item in unitList"
+                v-for="item in packtypeList"
                 :key="item.constKey"
                 :label="item.warehouseName"
                 :value="item.warehouseName"
@@ -41,12 +41,7 @@
           </ws-form-item>
           <!--负责人-->
           <ws-form-item label="负责人" span="1" prop="personCharge">
-            <ws-input
-              v-model="deptBudgetList.personCharge"
-              placeholder="负责人"
-              maxlength="20"
-              size="small"
-            />
+            {{deptBudgetList.personCharge}}
           </ws-form-item>
           <!--负责人电话-->
           <ws-form-item
@@ -55,122 +50,68 @@
             prop="personPhone"
             class="readonly"
           >
-            <ws-input
-              v-model="deptBudgetList.personPhone"
-              placeholder="负责人电话"
-              maxlength="100"
-              size="small"
-            />
+            {{deptBudgetList.personPhone}}
           </ws-form-item>
           <!--仓库所在地-->
           <ws-form-item label="仓库所在地" span="1" prop="warehouseLocation">
-            <ws-input
-              v-model="deptBudgetList.warehouseLocation"
-              placeholder="请输入仓库所在地"
-              maxlength="120"
-              size="small"
-            />
+            {{deptBudgetList.warehouseLocation}}
           </ws-form-item>
           <!--详细地址-->
-          <ws-form-item
-            label="详细地址"
-            span="1"
-            prop="detailedAddress"
-            class="readonly"
-          >
-            <ws-input
-              v-model="deptBudgetList.detailedAddress"
-              placeholder="请输入详细地址"
-              maxlength="100"
-              size="small"
-            />
+          <ws-form-item label="详细地址" span="1" prop="detailedAddress" class="readonly">
+           {{deptBudgetList.detailedAddress}}
           </ws-form-item>
           <!--总储量（吨)-->
-          <ws-form-item label="总储量（吨)" span="1" prop="totalStorage">
-            <ws-input
-              v-model="deptBudgetList.totalStorage"
-              placeholder="请输入总储量（吨)"
-              maxlength="20"
-              size="small"
-            />
+          <ws-form-item label="总储量（吨)" span="1" prop="totalStorage">      
+            {{deptBudgetList.totalStorage}}
           </ws-form-item>
+          </ws-info-table>
+          
+          <div v-for='item in deptBudgetList.warehousePositionInfoList'>
+            <ws-info-table>
           <!--仓位编号-->
-          <ws-form-item label="仓位编号" span="1" prop="binNumber">
-            <ws-input
-              v-model.number="deptBudgetList.binNumber"
+          <ws-form-item label="仓位编号" span="1" prop="binNumber" class="forlist">
+            <!-- <ws-input
+              v-model.number="item.binNumber"
               placeholder="请输入仓位编号"
               maxlength="100"
               size="small"
-            />
+            /> -->
+            {{item.binNumber}}
           </ws-form-item>
           <!--最大储量（吨）-->
-          <ws-form-item label="最大储量（吨）" span="1" prop="maxStorage">
-            <ws-input
-              v-model="deptBudgetList.maxStorage"
+          <ws-form-item label="最大储量（吨）" span="1" prop="maxStorage" class="forlist">
+            <!-- <ws-input
+              v-model="item.maxStorage"
               placeholder="请输入最大储量（吨）"
               maxlength="20"
               size="small"
-            />
+            /> -->
+            {{item.maxStorage}}
           </ws-form-item>
           <!--现有储量-->
           <ws-form-item label="现有储量" span="1" prop="nowStorage">
-            <ws-input
-              v-model="deptBudgetList.nowStorage"
+            <!-- <ws-input
+              v-model="item.nowStorage"
               placeholder="请输入现有储量"
               maxlength="100"
               size="small"
-            />
+            /> -->
+            {{item.nowStorage}}
           </ws-form-item>
-          <!--备注（选项）-->
-          <ws-form-item label="备注（选项）" span="1" prop="remark">
-            <ws-input
-              v-model="deptBudgetList.remark"
+          <!--备注（选填）-->
+          <ws-form-item label="备注（选填）" span="1" prop="remark">
+            <!-- <ws-input
+              v-model="item.remark"
               placeholder="请输入备注（选项）"
               maxlength="100"
               size="small"
-            />
+            /> -->
+            {{item.remark}}
           </ws-form-item>
-          <!--仓位编号-->
-          <ws-form-item label="仓位编号" span="1" prop="binNumber">
-            <ws-input
-              v-model.number="deptBudgetList.binNumber"
-              placeholder="请输入仓位编号"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-
-          <!--最大储量（吨）-->
-          <ws-form-item label="最大储量（吨）" span="1" prop="maxStorage">
-            <ws-input
-              v-model="deptBudgetList.maxStorage"
-              placeholder="请输入最大储量（吨）"
-              maxlength="20"
-              size="small"
-            />
-          </ws-form-item>
-          <!--现有储量-->
-          <ws-form-item label="现有储量" span="1" prop="nowStorage">
-            <ws-input
-              v-model="deptBudgetList.nowStorage"
-              placeholder="请输入现有储量"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <!--备注（选项）-->
-          <ws-form-item label="备注（选项）" span="1" prop="remark">
-            <ws-input
-              v-model="deptBudgetList.remark"
-              placeholder="请输入备注（选项）"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-        </ws-info-table>
+          </ws-info-table>
+          </div>
       </ws-form>
     </div>
-
     <div style="text-align: right; padding: 10px">
       <el-button
         class="bg-bottom-up"
@@ -223,10 +164,9 @@ export default {
       contractType: 2,
       startDate: null,
       endDate: null,
-      unitList:[],
+      unitList: [],
       // 提交类型
       submitType: true,
-      selectpackingMethod: {},
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
@@ -248,12 +188,7 @@ export default {
     }
   },
   activated() {
-    //cg.viewBudget
-    //cg.viewSpareMoney
-    // this.getVesselData();
-    // this.getList()
     this.loaddata()
-    //this.getLook()
     this.showType = this.isShow
   },
   methods: {
@@ -296,101 +231,32 @@ export default {
       console.log(`当前页: ${val}`)
       this.getList()
     },
+    selectpackingMethod(e) {
+      console.log(e)
+      for (var i = 0; i < this.packtypeList.length; i++) {
+        if (this.packtypeList[i].warehouseName == e) {
+         this.getLook(this.packtypeList[i].id)
+        }
+      }    
+    },
     loaddata() {
       // 仓库名称
-      xiala({ compId: sessionStorage.getItem('ws-pf_compId')})
+      xiala({ compId: sessionStorage.getItem('ws-pf_compId') })
         .toPromise()
         .then((response) => {
           this.packtypeList = response
         })
-        this.getUnitList()
-
-         // 数据
-      getLook({ id:this.compId })
-        .toPromise()
-        .then((response) => {
-          this.deptBudgetList = response
-        })
-    },
-    getUnitList() {
-      xiala({
-        compId: sessionStorage.getItem('ws-pf_compId'),
-        constCode: 'TYPEYAN',
-      })
-        .toPromise()
-        .then((response) => {
-          this.unitList = response
-          let currItem
-          this.unitList.forEach((item, index, arr) => {
-            item.flag = 'delete'
-            if (this.vModel == item.constKey) {
-              currItem = item
-            }
-          })
-          //
-          if (currItem) {
-            this.getLook(currItem.constValue)
-          }
-        })
     },
-
-    getLook() {
+    getLook(compId1) {
       getLook({
-        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,
-        contrPage: this.contrPage,
+        id: compId1,
       })
         .toPromise()
         .then((response) => {
-          for (var i = 0; i < response.records.length; i++) {
-            if (response.records[i].addressUrl != null) {
-              response.records[i].addressUrlArray = response.records[
-                i
-              ].addressUrl.split(',')
-            } else {
-              response.records[i].addressUrlArray = []
-            }
-          }
-          this.deptCircularPage.currentPage = response.current
-          this.deptCircularPage.pageSize = response.size
-          this.deptBudgetTotal = response.total
-          this.contractList = response
+         this.deptBudgetList=response
+         console.log(this.deptBudgetList)
         })
     },
-    // selecttaskType(e) {
-    //   for (var i = 0; i < this.taskTypeList.length; i++) {
-    //     if (this.taskTypeList[i].value == e) {
-    //       this.searchType = this.taskTypeList[i].type
-    //     }
-    //   }
-    // },
-    // fujian(row) {
-    //   if (
-    //     row.receiveAttachmentPath === null ||
-    //     row.receiveAttachmentPath === ''
-    //   ) {
-    //     EventBus.$emit(
-    //       'warning',
-    //       this.$t('system.noticeCircular.NoInformation')
-    //     )
-    //   } else {
-    //     this.accessoryTFs = true
-    //   }
-    //   this.appendixIdss = row.receiveAttachmentPath
-    // },
-    // handleExamine(row) {
-    //   this.$router.push({
-    //     name: 'salesContractExamine',
-    //     query: { id: row.id },
-    //   })
-    // },
-
     // 关闭 dialog时 处理文件url 初始化upload组件
     handleCloe() {
       this.dialogViewSpareMoney = false
@@ -438,4 +304,7 @@ export default {
 /deep/.el-form-item {
   width: 33.33%;
 }
+.forlist{
+  width: 16.67%;
+}
 </style>

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -88,7 +88,12 @@
           />
         </ws-form-item>
         <!--出库日期-->
-        <ws-form-item label="出库日期" span="1" prop="signingDate" class="deliverydate">
+        <ws-form-item
+          label="出库日期"
+          span="1"
+          prop="signingDate"
+          class="deliverydate"
+        >
           <ws-date-picker
             v-model="deptBudgetList.signingDate"
             type="date"
@@ -144,7 +149,7 @@
           @onChange="onChange"
           accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
         />
-      
+
         <div class="choice">
           <h2>化验数据（选填）</h2>
           <ws-info-table>
@@ -230,20 +235,18 @@
             </ws-form-item>
           </ws-info-table>
         </div>
-      
 
-      <div style="text-align: right; padding: 10px">
-        <el-button
-          class="bg-bottom-up"
-          type="primary"
-          size="small"
-          @click="submit()"
-          >提交</el-button
-        >
-      </div>
-      
+        <div style="text-align: right; padding: 10px">
+          <el-button
+            class="bg-bottom-up"
+            type="primary"
+            size="small"
+            @click="submit()"
+            >提交</el-button
+          >
+        </div>
       </ws-form>
-    </div> 
+    </div>
   </div>
 </template>
 <script>
@@ -288,14 +291,14 @@ export default {
       contractType: 2,
       startDate: null,
       endDate: null,
-      goodnameList:{},
+      goodnameList: {},
       // 提交类型
       submitType: true,
-      selectpackingMethod:{},
+      selectpackingMethod: {},
 
-      appendixIdsAdd:{},
-      uploadSuccess:{},
-      onChange:{},
+      appendixIdsAdd: {},
+      uploadSuccess: {},
+      onChange: {},
 
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
@@ -497,20 +500,20 @@ export default {
   right: 20px;
 }
 //选填
-/deep/.el-form-item{
+/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{
+/deep/.ws-info-table[data-v-850a44a6] .el-form-item .el-form-item__label {
   text-align: center;
 }
-.deliverydate{
+.deliverydate {
   width: 35%;
 }
-.center[data-v-32a9842f]{
+.center[data-v-32a9842f] {
   margin-top: -60px;
 }
 </style>

src/views/warehouse/warehouseManagementPut.vue

@@ -15,223 +15,224 @@
         >
       </el-col>
     </el-row>
-    <div class="center">
-      <h2>鲅鱼圈一号库 102仓位</h2>
-      <ws-form ref="deptBudgetList" :model="deptBudgetList">
-        <!-- 货名 -->
-        <ws-form-item label="货名" span="1" class="readonly">
-          <ws-select
-            placeholder=""
-            class="typeselect"
-            @change="selectpackingMethod"
+
+    <ws-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules">
+      <div class="basicInformation">
+        <h2>
+          {{ deptBudgetList.warehouseName }}库
+          {{ deptBudgetList.binNumber }}仓位
+        </h2>
+        <ws-info-table>
+          <!-- 货名 -->
+          <ws-form-item label="货名" span="1">
+            <ws-select
+              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="grossWeight">
+            <ws-input
+              @input="grossWeightchange"
+              v-model="deptBudgetList.grossWeight"
+              placeholder="请输入毛重"
+              maxlength="20"
+              size="small"
+            />
+          </ws-form-item>
+
+          <!--皮重（吨）-->
+          <ws-form-item
+            label="皮重（吨）"
+            span="1"
+            prop="tare"
+            class="readonly"
           >
-            <ws-option
-              v-for="item in goodnameList"
-              :key="item.constKey"
-              :label="item.constValue"
-              :value="item.constValue"
+            <ws-input
+              @input="tarechange"
+              v-model="deptBudgetList.tare"
+              placeholder="请输入皮重"
+              maxlength="100"
+              size="small"
             />
-          </ws-select>
-        </ws-form-item>
-        <!--毛重（吨）-->
-        <ws-form-item label="毛重（吨）" span="1" prop="shippingType">
+          </ws-form-item>
+
+          <!--净重（吨）-->
+          <ws-form-item label="净重（吨）" span="1" prop="netWeight">
+            <ws-input
+              v-model.number="deptBudgetList.netWeight"
+              placeholder="不可编辑，自动计算"
+              type="number"
+              maxlength="120"
+              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">
+            <ws-input
+              v-model="deptBudgetList.agent"
+              placeholder="请输入出库经办人姓名"
+              maxlength="100"
+              size="small"
+            />
+          </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">
+            <ws-select
+              v-model="deptBudgetList.inOutType"
+              placeholder=""
+              class="typeselect"
+              @change="selectstorageType"
+            >
+              <ws-option
+                v-for="item in storageType"
+                :key="item.constKey"
+                :label="item.constValue"
+                :value="item.constValue"
+              />
+            </ws-select>
+          </ws-form-item>
+
+          <!--车牌号-->
+          <ws-form-item label="车牌号" span="1" prop="sourceGoods">
+            <ws-input
+              v-model="deptBudgetList.carNo"
+              placeholder="请输入车牌号"
+              maxlength="20"
+              size="small"
+            />
+          </ws-form-item>
+
+          <!--合同编号-->
+          <ws-form-item label="合同编号" span="1" prop="contractNo">
+            <ws-input
+              v-model="deptBudgetList.contractNo"
+              placeholder="请输入合同编号"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
+        </ws-info-table>
+      </div>
+      <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"
+      />
+      <h2>化验数据（选填）</h2>
+      <ws-info-table>
+        <!--自检员-->
+        <ws-form-item label="质检员" span="1" prop="qualityInspector">
           <ws-input
-            v-model="deptBudgetList.shippingType"
-            placeholder="请输入毛重"
-            maxlength="20"
+            v-model="deptBudgetList.warehouseInOutDetail.qualityInspector"
+            placeholder="请输入质检员姓名"
+            maxlength="120"
             size="small"
           />
         </ws-form-item>
 
-        <!--皮重（吨）-->
-        <ws-form-item label="皮重（吨）" span="1" prop="buyer" class="readonly">
+        <!--水分（%）<=-->
+        <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
           <ws-input
-            v-model="deptBudgetList.buyer"
-            placeholder="请输入皮重"
-            maxlength="100"
+            v-model="deptBudgetList.warehouseInOutDetail.waterContent"
+            placeholder="请输入水分占比"
+            maxlength="120"
             size="small"
           />
         </ws-form-item>
-
-        <!--净重（吨）-->
-        <ws-form-item label="净重（吨）" span="1" prop="settlementMethod">
+        <!--杂质（%）<=-->
+        <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
           <ws-input
-            v-model="deptBudgetList.settlementMethod"
-            placeholder="不可编辑，自动计算"
+            v-model="deptBudgetList.warehouseInOutDetail.impurity"
+            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="bulkDensity">
           <ws-input
-            v-model="deptBudgetList.seller"
-            placeholder="请输入出库经办人姓名"
-            maxlength="100"
+            v-model="deptBudgetList.warehouseInOutDetail.bulkDensity"
+            placeholder="请输入容重"
+            maxlength="120"
             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 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" 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="jiaorenli">
           <ws-input
-            v-model="deptBudgetList.sourceGoods"
-            placeholder="请输入车牌号"
-            maxlength="20"
+            v-model="deptBudgetList.warehouseInOutDetail.jiaorenli"
+            placeholder="请输入热损伤占比"
+            maxlength="120"
             size="small"
           />
         </ws-form-item>
-
-        <!--合同编号-->
-        <ws-form-item label="合同编号" span="1" prop="contractNo">
+        <!--不完整粒（%）<=-->
+        <ws-form-item label="不完整粒（%）<=" span="1" prop="imperfectGrain">
           <ws-input
-            v-model.number="deptBudgetList.buyerPhone"
-            placeholder="请输入合同编号"
-            maxlength="100"
+            v-model="deptBudgetList.warehouseInOutDetail.imperfectGrain"
+            placeholder="请输入不完整粒占比"
+            maxlength="120"
             size="small"
           />
         </ws-form-item>
-
-        <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>
-      
-
+      </ws-info-table>
       <div style="text-align: right; padding: 10px">
         <el-button
           class="bg-bottom-up"
@@ -241,13 +242,11 @@
           >提交</el-button
         >
       </div>
-      
-      </ws-form>
-    </div> 
+    </ws-form>
   </div>
 </template>
 <script>
-import { getList, export1, billoperatehis } from '@/model/contarct/index'
+import { pullDown, addstorageputList } from '@/model/warehouse/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -260,9 +259,9 @@ export default {
     Pagination,
   },
   watch: {
-    vesselId(val) {
-      this.getList()
-    },
+    // vesselId(val) {
+    //   this.getList()
+    // },
     isShow(val) {
       this.showType = val
     },
@@ -288,15 +287,24 @@ export default {
       contractType: 2,
       startDate: null,
       endDate: null,
-      goodnameList:{},
+      goodnameList: {},
       // 提交类型
       submitType: true,
-      selectpackingMethod:{},
-
-      appendixIdsAdd:{},
-      uploadSuccess:{},
-      onChange:{},
-
+      storageType: [],
+      appendixIdsAdd: '',
+      uploadSuccess: {},
+      onChange: {},
+      gradeList: [],
+      rules: {
+        netWeight: [
+          {
+            required: true,
+            type: 'number',
+            message: '请输入活动名称',
+            trigger: 'blur',
+          },
+        ],
+      },
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
@@ -306,7 +314,9 @@ export default {
         month: dayjs().format('MM'),
       },
       contractList: [],
-      deptBudgetList: {},
+      deptBudgetList: {
+        warehouseInOutDetail: {},
+      },
       historyList: [],
 
       pickerBeginDateBefore: {
@@ -317,13 +327,23 @@ export default {
       accessoryTFs: false,
     }
   },
-  activated() {
-    //cg.viewBudget
-    //cg.viewSpareMoney
-    // this.getVesselData();
+  mounted() {
+    console.log(this.$route.query)
+    this.deptBudgetList.baseId = this.$route.query.baseId
+    this.deptBudgetList.positionId = this.$route.query.positionId
+    this.deptBudgetList.warehouseName = this.$route.query.warehouseName
+    this.deptBudgetList.binNumber = this.$route.query.binNumber
     this.getList()
-    this.showType = this.isShow
   },
+  // activated() {
+  //   //cg.viewBudget
+  //   //cg.viewSpareMoney
+  //   // this.getVesselData();
+  //   console.log(2222)
+  //   this.getList()
+  //   console.log(1111)
+  //   this.showType = this.isShow
+  // },
   methods: {
     //返回按钮
     returnWarehouse() {
@@ -331,29 +351,56 @@ export default {
     },
     //提交按钮
     submit() {
-      this.$router.push({ path: 'warehouseManagementList' })
+      this.$refs.deptBudgetList.validate((valid) => {
+        if (valid) {
+          this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
+          this.deptBudgetList.inOutFlag = 2
+          addstorageputList(this.deptBudgetList)
+            .toPromise()
+            .then((response) => {
+              this.$message.success('添加成功')
+              this.$router.push({ path: 'warehouseManagementList' })
+            })
+        } else {
+          EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+          return false
+        }
+      })
+    },
+    tarechange(e) {
+      if (this.deptBudgetList.grossWeight && this.deptBudgetList.tare) {
+        this.deptBudgetList.netWeight = Number(
+          this.deptBudgetList.grossWeight - this.deptBudgetList.tare
+        )
+      }
     },
-    dateFormat(fmt, date) {
-      let ret
-      const opt = {
-        'Y+': date.getFullYear().toString(), // 年
-        'm+': (date.getMonth() + 1).toString(), // 月
-        'd+': date.getDate().toString(), // 日
-        'H+': date.getHours().toString(), // 时
-        // "M+": date.getMinutes().toString(),         // 分
-        // "S+": date.getSeconds().toString()          // 秒
-        // 有其他格式化字符需求可以继续添加，必须转化成字符串
+    grossWeightchange(e) {
+      if (this.deptBudgetList.grossWeight && this.deptBudgetList.tare) {
+        this.deptBudgetList.netWeight = Number(
+          this.deptBudgetList.grossWeight - this.deptBudgetList.tare
+        )
       }
-      for (let k in opt) {
-        ret = new RegExp('(' + k + ')').exec(fmt)
-        if (ret) {
-          fmt = fmt.replace(
-            ret[1],
-            ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
-          )
+    },
+    selectgoodsName(e) {
+      for (var i = 0; i < this.goodnameList.length; i++) {
+        if (this.goodnameList[i].constValue == e) {
+          this.deptBudgetList.goodsNameKey = this.goodnameList[i].constKey
+        }
+      }
+    },
+    selectpackingMethod(e) {
+      for (var i = 0; i < this.packtypeList.length; i++) {
+        if (this.packtypeList[i].constValue == e) {
+          this.deptBudgetList.packingMethodKey = this.packtypeList[i].constKey
+        }
+      }
+    },
+    selectstorageType(e) {
+      for (var i = 0; i < this.storageType.length; i++) {
+        if (this.storageType[i].constValue == e) {
+          this.deptBudgetList.inOutTypeKey = this.storageType[i].constKey
         }
       }
-      return fmt
     },
     handleClose() {
       this.accessoryTFs = false
@@ -369,32 +416,23 @@ export default {
       this.getList()
     },
     getList() {
-      getList({
-        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,
-        contrPage: this.contrPage,
-      })
+      // 货名
+      pullDown({ constId: 'CON2' })
+        .toPromise()
+        .then((response) => {
+          this.goodnameList = response
+        })
+      // 品级
+      pullDown({ constId: 'CON3' })
         .toPromise()
         .then((response) => {
-          for (var i = 0; i < response.records.length; i++) {
-            if (response.records[i].addressUrl != null) {
-              response.records[i].addressUrlArray = response.records[
-                i
-              ].addressUrl.split(',')
-            } else {
-              response.records[i].addressUrlArray = []
-            }
-          }
-          this.deptCircularPage.currentPage = response.current
-          this.deptCircularPage.pageSize = response.size
-          this.deptBudgetTotal = response.total
-          this.contractList = response
+          this.gradeList = response
+        })
+      // 类型
+      pullDown({ constId: 'CON5' })
+        .toPromise()
+        .then((response) => {
+          this.storageType = response
         })
     },
     selecttaskType(e) {
@@ -437,46 +475,57 @@ export default {
           this.historyList = response
         })
     },
-    find() {
-      this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
-      this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
-      this.currentPage = 1
-      this.getList()
-    },
-    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() {},
     listQuery() {},
-    total() {},
-    clearfiltQuery() {},
-    selectCrtDuty() {},
   },
 }
 </script>
 <style lang="scss" scoped>
+/deep/.basicInformation {
+  .ws-info-table {
+    border: none;
+  }
+  .el-form-item {
+    width: 33.3333%;
+    border: none;
+    .el-form-item__label {
+      background: transparent;
+      border: none;
+    }
+    .el-form-item__content {
+      border: none;
+    }
+  }
+}
+.title {
+  position: relative;
+  padding-left: 10px;
+}
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.el-form {
+  padding: 0 10%;
+}
+.el-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+}
+.el-col {
+  background: #f6f7fc;
+}
+.bg-right {
+  text-align: right;
+  padding: 16px 20px;
+}
 .center {
   position: relative;
   top: 50px;
@@ -490,27 +539,24 @@ export default {
 /deep/.el-input--small {
   width: 70%;
 }
-.container .bg-bottom {
-  position: absolute;
-  float: right;
-  top: 15px;
-  right: 20px;
-}
 //选填
-/deep/.el-form-item{
+/deep/.el-form-item {
   width: 50%;
 }
 .container {
   overflow: scroll;
   height: 120vh;
 }
-/deep/.ws-info-table .el-form-item .el-form-item__label{
+
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+
   text-align: center;
 }
-.deliverydate{
+.deliverydate {
   width: 35%;
 }
-.center{
+.center {
+
   margin-top: -60px;
 }
 </style>

src/winseaUi/WsFormItem/src/index.vue

@@ -7,7 +7,7 @@ Rising * @Last Modified time: 2020-01-03 16:36:23 * @Description: WsForm辅助
     :label="label"
     :rules="rules"
     :prop="prop"
-    :required="JSON.stringify(rules) == '{}' ? false : requireFlag"
+    :required="JSON.stringify(rules) == '[]' ? false : requireFlag"
     :class="{
       showInputToopTip: showInputToopTip,
       showLableToopTip: showLableToopTip,
@@ -41,9 +41,9 @@ export default {
       default: null,
     },
     rules: {
-      type: Object,
+      type: Array,
       default() {
-        return {}
+        return []
       },
     },
     // 检验索引key