From a31172e356f45790c403fdd377eda8371002b3b5 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Thu, 21 Sep 2023 17:37:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9B=B4=E6=8E=A5=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/basic/basicPda.js                  | 312 +++++++++---------
 src/views/basic/forklift/basicForklift.vue    |  46 +--
 .../warehouseWarehouseingAddReceipt.vue       |  78 +++--
 vite.config.js                                |   4 +-
 4 files changed, 229 insertions(+), 211 deletions(-)

diff --git a/src/option/basic/basicPda.js b/src/option/basic/basicPda.js
index 5c56ab4c..528d9107 100644
--- a/src/option/basic/basicPda.js
+++ b/src/option/basic/basicPda.js
@@ -1,5 +1,5 @@
 export default {
-  height:'auto',
+  height: 'auto',
   calcHeight: 30,
   tip: false,
   searchShow: true,
@@ -12,160 +12,160 @@ export default {
   dialogClickModal: false,
   column: [
     {
-      label: "主键",
-      prop: "id",
-      type: "input",
+      label: '主键',
+      prop: 'id',
+      type: 'input',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       hide: true,
     },
     {
-      label: "租户号",
-      prop: "tenantId",
-      type: "input",
+      label: '租户号',
+      prop: 'tenantId',
+      type: 'input',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       hide: true,
     },
     {
-      label: "创建人",
-      prop: "createUser",
-      type: "input",
+      label: '创建人',
+      prop: 'createUser',
+      type: 'input',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       hide: true,
     },
     {
-      label: "创建时间",
-      prop: "createTime",
-      type: "input",
+      label: '创建时间',
+      prop: 'createTime',
+      type: 'input',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       hide: true,
     },
     {
-      label: "更新人",
-      prop: "updateUser",
-      type: "input",
+      label: '更新人',
+      prop: 'updateUser',
+      type: 'input',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       hide: true,
     },
     {
-      label: "更新时间",
-      prop: "updateTime",
-      type: "input",
+      label: '更新时间',
+      prop: 'updateTime',
+      type: 'input',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       hide: true,
     },
     {
-      label: "状态",
-      prop: "status",
-      type: "input",
+      label: '状态',
+      prop: 'status',
+      type: 'input',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       hide: true,
     },
     {
-      label: "是否已删除;1-未删除，2-已删除",
-      prop: "isDeleted",
-      type: "input",
+      label: '是否已删除;1-未删除，2-已删除',
+      prop: 'isDeleted',
+      type: 'input',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       hide: true,
     },
     {
-      label: "创建部门",
-      prop: "createDept",
-      type: "input",
+      label: '创建部门',
+      prop: 'createDept',
+      type: 'input',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       hide: true,
     },
     {
-      label: "产品名称",
-      prop: "name",
-      type: "input",
+      label: '产品名称',
+      prop: 'name',
+      type: 'input',
       search: true,
-      labelWidth:'150',
-      width:"100px",
-      align:'center',
-      span:11,
+      labelWidth: '150',
+      width: '130',
+      align: 'center',
+      span: 11,
     },
     {
-      label: "型号",
-      prop: "model",
-      type: "input",
+      label: '型号',
+      prop: 'model',
+      type: 'input',
       search: true,
-      labelWidth:'150',
-      width:"100px",
-      align:'center',
-      span:11,
+      labelWidth: '150',
+      width: '130',
+      align: 'center',
+      span: 11,
     },
     {
-      label: "设备序列号S/N",
-      prop: "deviceSerialNumber",
-      type: "input",
+      label: '设备序列号S/N',
+      prop: 'deviceSerialNumber',
+      type: 'input',
       search: true,
-      labelWidth:'150',
-      width:"150px",
-      align:'center',
-      span:11,
+      labelWidth: '150',
+      width: '150px',
+      align: 'center',
+      span: 11,
     },
     {
-      label: "购买金额",
-      prop: "purchaseAmount",
-      type: "input",
-      labelWidth:'150',
-      width:"100px",
-      align:'center',
-      span:11,
+      label: '购买金额',
+      prop: 'purchaseAmount',
+      type: 'input',
+      labelWidth: '150',
+      width: '130',
+      align: 'center',
+      span: 11,
     },
     {
-      label: "状态",
-      prop: "state",
-      type: "select",
+      label: '状态',
+      prop: 'state',
+      type: 'select',
       search: true,
-      labelWidth:'150',
-      width:"100px",
-      align:'center',
-      span:11,
+      labelWidth: '150',
+      width: '130',
+      align: 'center',
+      span: 11,
       dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_pad_state',
       props: {
         label: 'dictValue',
         value: 'dictKey',
       },
-      rules: [{ required: true, message: '请选择状态!',trigger: 'blur'}],
+      rules: [{ required: true, message: '请选择状态!', trigger: 'blur' }],
     },
     {
-      label: "当前使用仓",
-      prop: "currentUsageWarehouse",
-      type: "input",
+      label: '当前使用仓',
+      prop: 'currentUsageWarehouse',
+      type: 'input',
       search: true,
-      labelWidth:'150',
-      width:"120px",
-      align:'center',
-      span:11,
+      labelWidth: '150',
+      width: '130',
+      align: 'center',
+      span: 11,
     },
     {
-      label: "使用人",
-      prop: "user",
-      type: "input",
+      label: '使用人',
+      prop: 'user',
+      type: 'input',
       search: true,
-      labelWidth:'150',
-      width:"120px",
-      align:'center',
-      span:11,
+      labelWidth: '150',
+      width: '130',
+      align: 'center',
+      span: 11,
     },
     // {
     //   label: "使用人岗位id",
@@ -174,22 +174,22 @@ export default {
     //   search: true,
     // },
     {
-      label: "使用人岗位",
-      prop: "userPosition",
-      type: "input",
-      labelWidth:'150',
-      width:"120px",
-      align:'center',
-      span:11,
+      label: '使用人岗位',
+      prop: 'userPosition',
+      type: 'input',
+      labelWidth: '150',
+      width: '130',
+      align: 'center',
+      span: 11,
     },
     {
-      label: "是否收取押金",
-      prop: "isDeposit",
-      type: "select",
-      labelWidth:'150',
-      width:"150px",
-      align:'center',
-      span:11,
+      label: '是否收取押金',
+      prop: 'isDeposit',
+      type: 'select',
+      labelWidth: '150',
+      width: '130',
+      align: 'center',
+      span: 11,
       dicUrl: '/api/blade-system/dict-biz/dictionary?code=yes_no',
       props: {
         label: 'dictValue',
@@ -197,66 +197,66 @@ export default {
       },
     },
     {
-      label: "押金金额(元)",
-      prop: "deposit",
-      type: "input",
-      labelWidth:'150',
-      width:"120px",
-      align:'center',
-      span:11,
+      label: '押金金额(元)',
+      prop: 'deposit',
+      type: 'input',
+      labelWidth: '150',
+      width: '130',
+      align: 'center',
+      span: 11,
     },
     {
-      label: "采购公司",
-      prop: "purchasingCompany",
-      type: "input",
-      labelWidth:'150',
-      width:"100px",
-      align:'center',
-      span:11,
+      label: '采购公司',
+      prop: 'purchasingCompany',
+      type: 'input',
+      labelWidth: '150',
+      width: '130',
+      align: 'center',
+      span: 11,
     },
     {
-      label: "购买时间",
-      prop: "buyingTime",
-      type: "date",
-      format: "YYYY-MM-DD",
-      valueFormat: "YYYY-MM-DD",
-      labelWidth:'150',
-      width:"120px",
-      align:'center',
-      span:11,
+      label: '购买时间',
+      prop: 'buyingTime',
+      type: 'date',
+      format: 'YYYY-MM-DD',
+      valueFormat: 'YYYY-MM-DD',
+      labelWidth: '150',
+      width: '130',
+      align: 'center',
+      span: 11,
     },
     {
-      label: "保修截止时间",
-      prop: "warrantyPeriodEndTime",
-      type: "date",
-      format: "YYYY-MM-DD",
-      valueFormat: "YYYY-MM-DD",
-      labelWidth:'150',
-      width:"120px",
-      align:'center',
-      span:11,
+      label: '保修截止时间',
+      prop: 'warrantyPeriodEndTime',
+      type: 'date',
+      format: 'YYYY-MM-DD',
+      valueFormat: 'YYYY-MM-DD',
+      labelWidth: '150',
+      width: '130',
+      align: 'center',
+      span: 11,
     },
     {
-      label: "备注",
-      prop: "notes",
-      type: "input",
-      labelWidth:'150',
-      width:"100px",
-      align:'center',
-      span:11,
+      label: '备注',
+      prop: 'notes',
+      type: 'input',
+      labelWidth: '150',
+      width: '130',
+      align: 'center',
+      span: 11,
     },
     {
-      label: "图片",
-      prop: "photo",
-      type: "upload",
+      label: '图片',
+      prop: 'photo',
+      type: 'upload',
       dataType: 'string',
       listType: 'picture-img',
       // hide: true,
-      labelWidth:'150',
-      span:11,
-      multiple:false,
-      width:"200px",
-      align:'left',
+      labelWidth: '150',
+      span: 11,
+      multiple: false,
+      width: '200px',
+      align: 'left',
       action: '/blade-resource/oss/endpoint/put-file',
       propsHttp: {
         res: 'data',
@@ -264,49 +264,49 @@ export default {
       },
     },
     {
-      label: "预留1",
-      prop: "reserve1",
-      type: "input",
+      label: '预留1',
+      prop: 'reserve1',
+      type: 'input',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       hide: true,
     },
     {
-      label: "预留2",
-      prop: "reserve2",
-      type: "input",
+      label: '预留2',
+      prop: 'reserve2',
+      type: 'input',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       hide: true,
     },
     {
-      label: "预留3",
-      prop: "reserve3",
-      type: "input",
+      label: '预留3',
+      prop: 'reserve3',
+      type: 'input',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       hide: true,
     },
     {
-      label: "预留4",
-      prop: "reserve4",
-      type: "input",
+      label: '预留4',
+      prop: 'reserve4',
+      type: 'input',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       hide: true,
     },
     {
-      label: "预留5",
-      prop: "reserve5",
-      type: "input",
+      label: '预留5',
+      prop: 'reserve5',
+      type: 'input',
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       hide: true,
     },
-  ]
-}
+  ],
+};
diff --git a/src/views/basic/forklift/basicForklift.vue b/src/views/basic/forklift/basicForklift.vue
index 5c28595d..edfaf4cf 100644
--- a/src/views/basic/forklift/basicForklift.vue
+++ b/src/views/basic/forklift/basicForklift.vue
@@ -405,7 +405,7 @@ export default {
             label: '事业线',
             type: 2,
             values: '',
-            width: '150',
+            width: '130',
             checkarr: [],
             fixed: false,
             sortable: true
@@ -416,7 +416,7 @@ export default {
             label: '使用单位',
             type: 2,
             values: '',
-            width: '150',
+            width: '130',
             checkarr: [],
             fixed: false,
             sortable: true
@@ -427,7 +427,7 @@ export default {
             label: '受票主体',
             type: 2,
             values: '',
-            width: '150',
+            width: '130',
             checkarr: [],
             fixed: false,
             sortable: true
@@ -437,7 +437,7 @@ export default {
             label: '供应商',
             type: 2,
             values: '',
-            width: '150',
+            width: '130',
             checkarr: [],
             fixed: false,
             sortable: true
@@ -447,7 +447,7 @@ export default {
             label: '资产类型',
             type: 2,
             values: '',
-            width: '150',
+            width: '130',
             checkarr: [],
             fixed: false,
             sortable: true
@@ -457,7 +457,7 @@ export default {
             label: '类型',
             type: 2,
             values: '',
-            width: '150',
+            width: '130',
             checkarr: [],
             fixed: false,
             sortable: true
@@ -467,7 +467,7 @@ export default {
             label: '摘要',
             type: 2,
             values: '',
-            width: '150',
+            width: '130',
             checkarr: [],
             fixed: false,
             sortable: true
@@ -477,7 +477,7 @@ export default {
             label: '载重(T)',
             type: 2,
             values: '',
-            width: '150',
+            width: '130',
             checkarr: [],
             fixed: false,
             sortable: true
@@ -487,7 +487,7 @@ export default {
             label: '载高(M)',
             type: 2,
             values: '',
-            width: '150',
+            width: '130',
             checkarr: [],
             fixed: false,
             sortable: true
@@ -497,7 +497,7 @@ export default {
             label: '整车尺寸',
             type: 2,
             values: '',
-            width: '150',
+            width: '130',
             checkarr: [],
             fixed: false,
             sortable: true
@@ -507,7 +507,7 @@ export default {
             label: '货叉宽(M)',
             type: 2,
             values: '',
-            width: '150',
+            width: '130',
             checkarr: [],
             fixed: false,
             sortable: true
@@ -517,7 +517,7 @@ export default {
             label: '货叉长(M)',
             type: 2,
             values: '',
-            width: '150',
+            width: '130',
             checkarr: [],
             fixed: false,
             sortable: true
@@ -527,7 +527,7 @@ export default {
             label: '最小转弯半径(M)',
             type: 2,
             values: '',
-            width: '150',
+            width: '180',
             checkarr: [],
             fixed: false,
             sortable: true
@@ -537,7 +537,7 @@ export default {
             label: '通道宽(M)',
             type: 2,
             values: '',
-            width: '150',
+            width: '130',
             checkarr: [],
             fixed: false,
             sortable: true
@@ -547,7 +547,7 @@ export default {
             label: '月租(元/月)',
             type: 2,
             values: '',
-            width: '150',
+            width: '130',
             checkarr: [],
             fixed: false,
             sortable: true
@@ -557,7 +557,7 @@ export default {
             label: '数量(台)',
             type: 2,
             values: '',
-            width: '150',
+            width: '130',
             checkarr: [],
             fixed: false,
             sortable: true
@@ -567,7 +567,7 @@ export default {
             label: '合同编号',
             type: 2,
             values: '',
-            width: '150',
+            width: '130',
             checkarr: [],
             fixed: false,
             sortable: true
@@ -577,7 +577,7 @@ export default {
             label: '起租期限',
             type: 2,
             values: '',
-            width: '150',
+            width: '130',
             checkarr: [],
             fixed: false,
             sortable: true
@@ -617,7 +617,7 @@ export default {
             label: '押金(元)',
             type: 2,
             values: '',
-            width: '150',
+            width: '130',
             checkarr: [],
             fixed: false,
             sortable: true
@@ -627,7 +627,7 @@ export default {
             label: '付款方式',
             type: 2,
             values: '',
-            width: '150',
+            width: '130',
             checkarr: [],
             fixed: false,
             sortable: true
@@ -637,7 +637,7 @@ export default {
             label: '备注',
             type: 2,
             values: '',
-            width: '150',
+            width: '130',
             checkarr: [],
             fixed: false,
             sortable: true
@@ -647,7 +647,7 @@ export default {
             label: '所属仓库',
             type: 2,
             values: '',
-            width: '150',
+            width: '130',
             checkarr: [],
             fixed: false,
             sortable: true
@@ -657,7 +657,7 @@ export default {
             label: '操作',
             type: 6,
             values: '',
-            width: '150',
+            width: '200',
             checkarr: [],
             fixed: 'right',
             sortable: false
diff --git a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
index b0c0682b..d0dbb41a 100644
--- a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
+++ b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
@@ -14,7 +14,7 @@
           <!-- 表单字段 -->
           <el-col :span="24">
             <el-form-item label="入库批次" prop="receiptBatch">
-              <el-input v-model="form.receiptBatch" clearable  placeholder="请输入入库批次" />
+              <el-input v-model="form.receiptBatch" clearable placeholder="请输入入库批次" />
             </el-form-item>
             <el-form-item label="入库时间" prop="receiptDate">
               <!--              <el-input v-model="form.receiptDate" placeholder="请输入入库时间"/>-->
@@ -22,7 +22,7 @@
                 v-model="form.receiptDate"
                 placeholder="请选择入库时间"
                 type="datetime"
-                clearable 
+                clearable
                 format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD"
               />
@@ -39,7 +39,7 @@
                 remote-show-suffix
                 :remote-method="remoteMethod"
                 :loading="loading"
-                clearable 
+                clearable
                 @change="getMenDian($event, 1)"
                 placeholder="请输入客户名称"
               >
@@ -64,7 +64,7 @@
                 :loading="loading"
                 @change="getMenDian($event, 2)"
                 placeholder="请输入客户编码"
-                clearable 
+                clearable
               >
                 <el-option
                   v-for="item in optionCodes"
@@ -82,7 +82,7 @@
                 v-model="form.storeId"
                 filterable
                 allow-create
-                clearable 
+                clearable
                 default-first-option
                 :reserve-keyword="false"
                 @change="getMen($event, 1)"
@@ -100,12 +100,12 @@
           <el-col :span="24">
             <!--            <el-form-item label="物流单号" prop="trainNumber">-->
             <el-form-item label="物流车次">
-              <el-input v-model="form.trainNumber" clearable  placeholder="请输入物流车次" />
+              <el-input v-model="form.trainNumber" clearable placeholder="请输入物流车次" />
             </el-form-item>
 
             <!--            <el-form-item label="入库车牌" prop="licensePlate">-->
             <el-form-item label="入库车牌">
-              <el-input v-model="form.licensePlate" clearable  placeholder="请输入入库车牌" />
+              <el-input v-model="form.licensePlate" clearable placeholder="请输入入库车牌" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -256,28 +256,24 @@
         v-if="!typeView || this.$route.query.type == '3'"
       >
         <span class="dialog-footer">
+          <el-button
+            type="primary"
+            icon="el-icon-circle-check"
+            @click="handleSubmit"
+            :disabled="view && !this.$route.query.type == '3'"
+            v-if="this.$route.query.type"
+            >提 交1</el-button
+          >
           <el-button
             type="primary"
             icon="el-icon-circle-check"
             @click="showCommitButton"
             :disabled="view && !this.$route.query.type == '3'"
-            v-if="!hideButton"
+            v-else-if="!hideButton"
             >提 交</el-button
           >
-          <span v-else>
-            <!-- <el-button
-              v-if="this.$route.query.type !== '3'"
-              icon="el-icon-circle-check"
-              @click="handleSubmit"
-            >
-              预约入库
-            </el-button> -->
-            <el-button
-              icon="el-icon-circle-check"
-              @click="handleSubmit"
-            >
-              预约入库
-            </el-button>
+          <span v-else-if="hideButton">
+            <el-button icon="el-icon-circle-check" @click="handleSubmit"> 预约入库 </el-button>
             <el-button icon="el-icon-circle-check" @click="handleHirectStorage">
               直接入库
             </el-button>
@@ -987,6 +983,8 @@ export default {
             console.log('this.form111', this.form);
             if (this.data.length > 0) {
               this.form.list = this.data;
+              // 预约入库类型为1
+              this.form.type = '1';
               add(this.form).then(() => {
                 this.box = false;
                 this.onLoad(this.page);
@@ -1013,6 +1011,7 @@ export default {
             if (!!this.form.totalInput && parseInt(this.form.totalInput) == '-1') {
               this.form.totalInput = null;
             }
+            this.form.type = '1';
             this.form.list = this.data;
             update(this.form).then(() => {
               this.box = false;
@@ -1032,15 +1031,34 @@ export default {
     },
     // 直接入库
     handleHirectStorage() {
-      this.$message({
-        type: 'success',
-        message: '功能还在开发中',
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          if (!this.form.id) {
+            console.log('this.form111', this.form);
+            if (this.data.length > 0) {
+              this.form.list = this.data;
+              // 直接入库类型为2
+              this.form.type = '2';
+              add(this.form).then(() => {
+                this.box = false;
+                this.onLoad(this.page);
+                this.$message({
+                  type: 'success',
+                  message: '操作成功!',
+                });
+              });
+              this.form = {};
+              this.data = [];
+              // 操作完成后关闭本页标签
+              this.$store.commit('DEL_TAG', this.$store.state.tags.tag);
+              // 操作完成后返回入库列表页面
+              this.$router.push('/warehouse/warehousingentry/warehouseWarehousingEntry');
+            } else {
+              this.$message.warning('请添加物资详情！！！');
+            }
+          }
+        }
       });
-
-      // 操作完成后关闭本页标签
-      this.$store.commit('DEL_TAG', this.$store.state.tags.tag);
-      // 返回入库列表页面
-      this.$router.push('/warehouse/warehousingentry/warehouseWarehousingEntry');
     },
     handleAdd() {
       this.title = '新增';
diff --git a/vite.config.js b/vite.config.js
index fa1ec37b..7af26f26 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -13,10 +13,10 @@ export default ({ mode, command }) => {
       proxy: {
         '/api': {
           // target: 'http://192.168.10.101:8888',
-          target: 'http://192.168.10.123:8889',
+          // target: 'http://192.168.10.123:8889',
           // target: 'http://192.168.10.48:8888',
           // target: 'http://192.168.10.101:8888',
-          // target: 'http://192.168.10.75:8777',
+          target: 'http://192.168.10.75:8777',
           // target: 'http://test.api.huitongys.com',
           // target: 'http://192.168.10.101:8888',
           // target: 'http://192.168.10.29:13000',