中心仓禅道bug优化

src/views/storehouse/inStockManage/inStockPlan/detailsPage.vue

@@ -93,12 +93,14 @@
                             </template>
                             <template slot="goodsNumForm" slot-scope="{ row }">
                                 <el-input-number v-if="row.$cellEdit" size="small" v-model="row.goodsNum"
+                                                 type="number" :min="1" :max="99999"
                                     :controls="false" :precision="numberDecimal" style="width: 100%"
                                     @change="moneyChange(row)"></el-input-number>
                                 <span v-else>{{ row.goodsNum }}</span>
                             </template>
                             <template slot="price" slot-scope="{ row }">
                                 <el-input v-if="row.$cellEdit" size="small" v-model="row.price" style="width: 100%"
+                                          type="number" :controls="false"
                                     @change="moneyChange(row)"></el-input>
                                 <span v-else>{{ row.price }}</span>
                             </template>
@@ -152,12 +154,13 @@
                             </template>
                             <tempalte slot="costPriceForm" slot-scope="{ row }">
                                 <el-input-number v-if="row.$cellEdit" v-model="row.costPrice" @change="countChange(row)"
-                                    :controls="false" placeholder="请输入 单价" size="small"
+                                    type="number" :controls="false" placeholder="请输入 单价" size="small"
                                     style="width: 100%;"></el-input-number>
                                 <span v-else>{{ row.costPrice }}</span>
                             </tempalte>
                             <tempalte slot="goodsNumForm" slot-scope="{ row }">
                                 <el-input-number v-if="row.$cellEdit" v-model="row.goodsNum" @change="countChange(row)"
+                                                 type="number" :min="1" :max="99999"
                                     :controls="false" placeholder="请输入 数量" size="small"
                                     style="width: 100%;"></el-input-number>
                                 <span v-else>{{ row.goodsNum }}</span>
@@ -465,7 +468,7 @@ export default {
                     prop: "businesDate",
                     searchProp: "businesDateList",
                     disabled: false,
-                    type: "datetime",
+                    type: "date",
                     value: dateFormat(new Date(), 'yyyy-MM-dd'),
                     format: "yyyy-MM-dd",
                     valueFormat: "yyyy-MM-dd",
@@ -1109,6 +1112,7 @@ export default {
                         })
                     })
                 }
+                this.excelBox = false
             } else {
                 this.$message.error(res)
             }
@@ -1139,8 +1143,8 @@ export default {
                 this.findObject(this.excelOption.column, "excelFile").action = '/api/blade-sales-part/order/import-item-name'
                 this.templateUrl = '/api/blade-sales-part/order/export-item-name'
             } else if (name == 'code') {
-                this.findObject(this.excelOption.column, "excelFile").action = '/api/blade-sales-part/order/import-item-code'
-                this.templateUrl = '/api/blade-sales-part/tire/center/warehouse/stockDesc/export-item-code'
+                this.findObject(this.excelOption.column, "excelFile").action = '/api/blade-sales-part/tire/center/warehouse/plan/import-item-code?storageId=' + this.form.storageId
+                this.templateUrl = '/api/blade-sales-part/tire/center/warehouse/plan/export-item-code?storageId=' + this.form.storageId
             }
             this.excelBox = true
         },
@@ -1214,7 +1218,7 @@ export default {
                         background: 'rgba(255,255,255,0.7)'
                     });
                     submit(obj).then(res => {
-                        this.$message.success("提交成功");
+                        this.$message.success(type === 1 ? "提交成功" : "保存成功");
                         this.getDetail(res.data.data)
                     }).finally(() => {
                         loading.close();

src/views/storehouse/inventoryManage/inventory/detail.vue

@@ -50,7 +50,8 @@ export default {
           stockId: this.$route.query.stockId,
           dot:this.$route.query.dot,
           regionId: this.$route.query.regionId,
-          customerId: this.$route.query.customerId
+          customerId: this.$route.query.customerId,
+          planId: this.$route.query.planId
       }
       this.onLoad(this.page)
   },

src/views/storehouse/inventoryManage/inventory/index.vue

@@ -155,6 +155,12 @@ export default {
                 search: true,
                 overHidden: true
             },
+            {
+                label: '入库单号',
+                prop: "planNo",
+                search: true,
+                overHidden: true
+            },
           {
             label: '商品名称',
             prop: "cname",
@@ -579,6 +585,7 @@ export default {
         this.params.itemId = row.goodsId
         this.params.regionId = row.regionId
         this.params.customerId = row.customerId
+        this.params.planId = row.planId
         this.$router.$avueRouter.closeTag("/storehouse/inventoryManage/inventory/detail");
         this.$router.push({
           path: "/storehouse/inventoryManage/inventory/detail",
@@ -586,7 +593,8 @@ export default {
             regionId: row.regionId,
             goodsId: row.goodsId,
             dot: row.dot,
-              customerId: row.customerId
+              customerId: row.customerId,
+              planId: row.planId
           },
         });
       }

src/views/storehouse/outStockManage/outStockPlan/detailsPage.vue

@@ -95,6 +95,7 @@
                             <template slot="goodsNumForm" slot-scope="{ row }">
                                 <el-input-number v-if="row.$cellEdit" size="small" v-model="row.goodsNum"
                                     :precision="numberDecimal" :controls="false" @blur="goodsNumblurfun(row)"
+                                                 type="number" :min="1" :max="99999"
                                     style="width: 100%" @change="moneyChange(row)"></el-input-number>
                                 <span v-else>{{ row.goodsNum }}</span>
                             </template>
@@ -144,6 +145,7 @@
                             </template>
                             <tempalte slot="costPriceForm" slot-scope="{ row }">
                                 <el-input-number v-if="row.$cellEdit" v-model="row.costPrice" @change="countChange(row)"
+                                                 type="number"
                                     :controls="false" placeholder="请输入 单价" size="small"
                                     style="width: 100%;"></el-input-number>
                                 <span v-else>{{ row.costPrice }}</span>
@@ -151,6 +153,7 @@
                             <tempalte slot="goodsNumForm" slot-scope="{ row }">
                                 <el-input-number v-if="row.$cellEdit" v-model="row.goodsNum" @change="countChange(row)"
                                     :controls="false" placeholder="请输入 数量" size="small"
+                                                 type="number" :min="1" :max="99999"
                                     style="width: 100%;"></el-input-number>
                                 <span v-else>{{ row.goodsNum }}</span>
                             </tempalte>
@@ -191,12 +194,14 @@
                             <tempalte slot="costPriceForm" slot-scope="{ row }">
                                 <el-input-number v-if="row.$cellEdit" v-model="row.costPrice" @change="countChange(row)"
                                     :controls="false" placeholder="请输入 单价" size="small"
+                                                 type="number"
                                     style="width: 100%;"></el-input-number>
                                 <span v-else>{{ row.costPrice }}</span>
                             </tempalte>
                             <tempalte slot="goodsNumForm" slot-scope="{ row }">
                                 <el-input-number v-if="row.$cellEdit" v-model="row.goodsNum" @change="countChange(row)"
                                     :controls="false" placeholder="请输入 数量" size="small"
+                                                 type="number" :min="1" :max="99999"
                                     style="width: 100%;"></el-input-number>
                                 <span v-else>{{ row.goodsNum }}</span>
                             </tempalte>
@@ -1301,7 +1306,7 @@ export default {
                         background: 'rgba(255,255,255,0.7)'
                     });
                     submitOutPlan(obj).then(res => {
-                        this.$message.success("提交成功");
+                        this.$message.success(type === 1 ? "提交成功" : "保存成功");
                         this.getDetail(res.data.data)
                     }).finally(() => {
                         loading.close();

src/views/storehouse/outStockManage/outStockPlan/index.vue

@@ -286,11 +286,12 @@ export default {
           label: '数量',
           prop: "goodsTotalNum",
           overHidden: true,
-        }, {
+        },
+/*            {
           label: '金额',
           prop: "totalMoney",
           overHidden: true,
-        },
+        },*/
         {
           label: '状态',
           prop: "status",

src/views/tirePartsMall/basicData/customerInformation/detailsPage.vue

@@ -37,12 +37,22 @@
           <template slot="deliveryWarehouseId">
             <div style="display:flex;">
               <avue-input-tree v-model="form.deliveryWarehouseId" :disabled="option.disabled" placeholder="请选择发货仓库"
+                               @change="warehouseChange"
                 :dic="corpTypeListCk" :props="propsCk">
               </avue-input-tree>
               <i class="el-icon-circle-plus-outline" style="font-size:18px;line-height: 32px;margin-left:4px"
                 @click="dialogVisibleCK = true"></i>
             </div>
           </template>
+            <template slot="resourceWarehouseList">
+                <div style="display:flex;">
+                    <avue-input-tree v-model="form.resourceWarehouseList" :disabled="option.disabled" placeholder="请选择资源仓库"
+                                     :dic="resourceWarehouseDataList.filter(item => item.id !== form.deliveryWarehouseId)" :props="propsCk">
+                    </avue-input-tree>
+                    <i class="el-icon-circle-plus-outline" style="font-size:18px;line-height: 32px;margin-left:4px"
+                       @click="dialogVisibleCK = true"></i>
+                </div>
+            </template>
           <template slot="limitAmount">
             <div style="display:flex;">
               <el-input v-model="form.limitAmount" disabled size="small" placeholder="请输入额度"></el-input>
@@ -396,6 +406,7 @@ export default {
       contactsData: [],
       corpTypeList: [],
       corpTypeListCk: [],
+        resourceWarehouseDataList: [],
       corpTypeVisible: false,
       activeName: 'first',
       loadingBtn: false,
@@ -489,7 +500,7 @@ export default {
               trigger: "blur"
             }]
           },
-/*            {
+            {
                 label: "资源仓库",
                 prop: "resourceWarehouseList",
                 span: 12,
@@ -505,7 +516,7 @@ export default {
                     message: " ",
                     trigger: "blur"
                 }]
-            },*/
+            },
           {
             label: "商城价格",
             prop: "priceSystem",
@@ -726,6 +737,10 @@ export default {
     }, 100)
   },
   methods: {
+      warehouseChange(val){
+          this.form.resourceWarehouseList = []
+          console.info('vall----', val)
+      },
       openRecordDialog(){
           this.$refs.checkGreenRecyclingRecordRef.getList(this.form.id)
           this.$refs.checkGreenRecyclingRecordRef.show = true
@@ -1006,6 +1021,7 @@ export default {
     getCorpTypeCk() {
       customerListAll().then(res => {
         this.corpTypeListCk = res.data.data
+        this.resourceWarehouseDataList = res.data.data
       })
     }
     ,