中心仓功能优化调整

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

@@ -41,12 +41,12 @@
                     </template>
                     <tempalte slot="customerName">
                         <dic-select v-model="form.customerName" placeholder="货主" key="id" label="cname" res="records"
-                            url="/blade-sales-part/corpsDesc/list?current=1&size=20&&enableOrNot=1" :filterable="true"
+                            url="/blade-sales-part/corpsDesc/list?current=1&size=20&&enableOrNot=1&corpType=KH" :filterable="true"
                             :remote="true" dataName="cname" @selectChange="dicChange('customerName', $event)"
                             :disabled="editButton || form.status == 1"></dic-select>
                     </tempalte>
                     <tempalte slot="storageName">
-                        <dic-select v-model="form.storageName" placeholder="货主" key="id" label="cname" res="records"
+                        <dic-select v-model="form.storageName" placeholder="仓库" key="id" label="cname" res="records"
                             url="/blade-sales-part/tire/center/warehouse/storage/list?current=1&size=5"
                             :filterable="true" :remote="true" dataName="cname"
                             @selectChange="dicChange('storageName', $event)"
@@ -893,7 +893,7 @@ export default {
             if (name == 'storageName') {
                 if (row) {
                     this.form.storageId = row.id
-                    // this.form.warehouseKeeperName=row.realName
+                    this.form.storageName=row.cname
                 } else {
                     this.form.storageId = null
                     this.form.storageName = null
@@ -1125,6 +1125,10 @@ export default {
                 this.$message.error('请选择货主')
                 return
             }
+            if (!this.form.storageId) {
+                this.$message.error('请选择仓库')
+                return
+            }
             if (name == '名称') {
                 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'

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

@@ -36,7 +36,7 @@
                 <template slot-scope="{type,size,row,index}" slot="menu">
                     <!-- <el-button :size="size" :type="type" @click="check(row)">查看</el-button> -->
                     <!--  判断是否一键采购过 然后展示不同的判断按钮-->
-                    <el-button :size="size" :type="type" :disabled="row.status !== 1 && row.numberRows >= 1"
+                    <el-button :size="size" :type="type" :disabled="row.status && row.status !== '1'"
                         @click="$refs.crud.rowDel(row, index)">删除
                     </el-button>
                 </template>
@@ -321,7 +321,7 @@ export default {
                     label: '结算状态',
                     prop: "actualPaymentStatus",
                     searchProp: 'actualPaymentType',
-                    search: true,
+                    search: false,
                     overHidden: true,
                     type: 'select',
                     dicData: [

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

@@ -985,7 +985,7 @@ export default {
             if (name == 'storageName') {
                 if (row) {
                     this.form.storageId = row.id
-                    // this.form.warehouseKeeperName=row.realName
+                    this.form.storageName=row.cname
                 } else {
                     this.form.storageId = null
                     this.form.storageName = null

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

@@ -35,7 +35,7 @@
         <template slot-scope="{type,size,row,index}" slot="menu">
           <!-- <el-button :size="size" :type="type" @click="check(row)">查看</el-button> -->
           <el-button :size="size" :type="type"
-            :disabled="row.status != '录入' && row.status != '待确认' && row.item >= 1 || row.businessSource == '外部销售' || row.billType == 1"
+            :disabled="row.status && row.status !== '1'"
             @click="$refs.crud.rowDel(row, index)">删除</el-button>
         </template>
         <template slot="corpNameSearch">
@@ -239,16 +239,16 @@ export default {
           overHidden: true,
           cell: true,
           width: 140,
-          // type: 'select',
-          // filterable: true,
-          // props: {
-          //   label: 'cname',
-          //   value: 'cname',
-          //   res: 'data.records'
-          // },
-          // dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=KH&cname={{key}}',
+          type: 'select',
+          filterable: true,
+          props: {
+            label: 'cname',
+            value: 'cname',
+            res: 'data.records'
+          },
+          dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=KH&cname={{key}}',
         },
-        {
+/*        {
           label: '业务员',
           disabled: false,
           prop: "salerName",
@@ -265,12 +265,13 @@ export default {
             message: " ",
             trigger: "blur"
           }]
-        }, {
+        }, */
+            {
           label: '仓库',
           prop: "storageName",
           search: true,
           overHidden: true,
-          // remote: true,
+          remote: true,
           type: 'select',
           props: {
             label: 'cname',
@@ -302,49 +303,8 @@ export default {
             label: "dictValue",
             value: "dictKey"
           },
-        }, {
-          label: '结算状态',
-          prop: "actualPaymentStatus",
-          searchProp: 'actualPaymentType',
-          search: true,
-          overHidden: true,
-          type: 'select',
-          dicData: [
-            {
-              label: "待收款",
-              value: 1,
-            },
-            {
-              label: "已收款",
-              value: 2,
-            },
-            {
-              label: "尾款",
-              value: 3,
-            },
-            {
-              label: "已退款",
-              value: 4,
-            }
-          ],
-
-          // dicUrl: "/api/blade-system/dict-biz/dictionary?code=settlement_Status",
-          // props: {
-          //   label: "dictValue",
-          //   value: "dictKey"
-          // }
-
-        },
-        {
-          label: '备注',
-          prop: "remarks",
-          overHidden: true,
-        },
-        {
-          label: '应结日期',
-          prop: "dueDate",
-          overHidden: true,
         },
+
         {
           label: '业务日期',
           prop: "businesDate",
@@ -359,33 +319,12 @@ export default {
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss"
         },
-        {
-          label: '出库日期',
-          prop: "deliveryBusinesDate",
-          searchProp: "deliveryBusinesDateList",
-          type: "date",
-          overHidden: true,
-          search: true,
-          width: 100,
-          unlinkPanels: true,
-          searchRange: true,
-          searchDefaultTime: ["00:00:00", "23:59:59"],
-          format: "yyyy-MM-dd",
-          valueFormat: "yyyy-MM-dd HH:mm:ss"
-        }, {
-          label: '收费日期',
-          prop: "paymentDate",
-          searchProp: "paymentDateList",
-          type: "date",
-          overHidden: true,
-          search: true,
-          width: 100,
-          unlinkPanels: true,
-          searchRange: true,
-          searchDefaultTime: ["00:00:00", "23:59:59"],
-          format: "yyyy-MM-dd",
-          valueFormat: "yyyy-MM-dd HH:mm:ss"
-        }, {
+            {
+                label: '备注',
+                prop: "remarks",
+                overHidden: true,
+            },
+/*            {
           label: "制单人",
           prop: "createUserName",
           searchProp: "createUser",
@@ -437,7 +376,7 @@ export default {
           searchDefaultTime: ["00:00:00", "23:59:59"],
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss"
-        }]
+        }*/]
       }
     }
   },

src/views/storehouse/storage-region/detailsPage.vue

@@ -9,7 +9,7 @@
                     </el-button>
                 </div>
                 <div class="add-customer-btn">
-                    <el-button v-if="!form.status || form.status === 0" type="primary" size="small" @click="saveStorage">
+                    <el-button type="primary" size="small" @click="saveStorage">
                         保 存
                     </el-button>
                     <el-button v-if="!form.status || form.status === 0" type="warning" size="small" @click="submitStorage">
@@ -22,9 +22,9 @@
             </div>
             <trade-card title="主要信息" style="margin-top: 60px">
                 <avue-form ref="form" class="trading-form" v-model="form" :option="option" :key="key">
-<!--                    <template slot="code" slot-scope="{row}">
-                        <el-input v-model="row.code" placeholder="仓库代码为空，提交时自动生成"></el-input>
-                    </template>-->
+                    <template slot="regionCode">
+                        <el-input v-model="form.regionCode" :disabled="form.status && form.status === 1"></el-input>
+                    </template>
                 </avue-form>
             </trade-card>
         </div>
@@ -96,6 +96,9 @@ export default {
     },
     mounted() {
         console.info(this.onLoad)
+        if (this.onLoad.id) {
+            this.getItem(this.onLoad.id)
+        }
     },
     methods: {
         backToList() {

src/views/storehouse/storage-region/index.vue

@@ -32,6 +32,10 @@
                                        @click="rowDel(row)">删 除
                             </el-button>
                         </template>
+                        <template slot-scope="{ row, index }" slot="regionCode">
+                    <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row)">{{ row.regionCode }}
+                    </span>
+                        </template>
                         <template slot="status" slot-scope="{row,size}">
                             <span v-if="row.status === 1">启用</span>
                             <span v-if="row.status === 0">保存</span>
@@ -152,6 +156,10 @@ export default {
             this.getStorageTree()
         },
 
+        editOpen(row){
+            this.nowClick.id = row.id
+            this.detailsOpen = true
+        },
         addStorageRegion() {
             if (!this.query.parentId) {
                 this.$message({

src/views/storehouse/storage/detailsPage.vue

@@ -9,7 +9,7 @@
                     </el-button>
                 </div>
                 <div class="add-customer-btn">
-                    <el-button v-if="!form.status || editStatusList.indexOf(form.status) !== -1" type="primary" size="small" @click="saveStorage">
+                    <el-button type="primary" size="small" @click="saveStorage">
                         保 存
                     </el-button>
                     <el-button v-if="!form.status || editStatusList.indexOf(form.status) !== -1" type="warning" size="small" @click="submitStorage">
@@ -113,14 +113,12 @@ export default {
         onLoad: Object,
     },
     watch: {
-        onLoad: {
-            handler(val) {
-            },
-            deep: true
-        }
     },
     mounted() {
-        console.info(this.onLoad)
+        console.info(this.onLoad.id)
+        if (this.onLoad.id) {
+            this.getItem(this.onLoad.id)
+        }
     },
     methods: {
         disabledCanterStorage(){

src/views/storehouse/storage/index.vue

@@ -19,6 +19,10 @@
                        @size-change="sizeChange"
                        @refresh-change="refreshChange"
                        @on-load="onLoad">
+                <template slot-scope="{ row, index }" slot="code">
+                    <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row)">{{ row.code }}
+                    </span>
+                </template>
                 <template slot-scope="{type,size,row,index,disabled}" slot="menu">
                     <el-button type="text"
                                size="small"
@@ -105,7 +109,7 @@ export default {
                             message: "请输入联系人",
                             trigger: "blur"
                         }],
-                        search: true,
+                        search: false,
                         searchSpan: 4,
                         align: 'center'
                     },
@@ -122,7 +126,7 @@ export default {
                     {
                         label: "状态",
                         prop: "status",
-                        search: true,
+                        search: false,
                         searchSpan: 4,
                         align: 'center'
                     }
@@ -151,6 +155,11 @@ export default {
         }
     },
     methods: {
+        editOpen(row){
+            this.form.id = row.id
+            // this.$refs.detailRef.getItem(row.id)
+            this.detailsOpen = true
+        },
         backToList() {
             this.detailsOpen = false
             this.onLoad(this.page);
@@ -169,6 +178,7 @@ export default {
             });
         },
         addStorage() {
+            this.form = {}
             this.detailsOpen = true
         },
         rowUpdate(row, index, done, loading) {