Qukatie пре 1 недеља
родитељ
комит
9496e757f5

+ 186 - 185
src/views/storehouse/inStockManage/inStockPlan/index.vue

@@ -2,41 +2,42 @@
     <div>
         <basic-container v-show="!detailsOpen">
             <avue-crud :option="option" :search.sync="search" v-model="form" :table-loading="loading" :data="dataList"
-                       ref="crud" :key="key" @on-load="onLoad" @search-change="searchChange" @row-del="rowDel"
-                       @expand-change="expandChange" @refresh-change="refreshChange"
-                       @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 274.4)"
-                       @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 274.4)" :page.sync="page">
+                ref="crud" :key="key" @on-load="onLoad" @search-change="searchChange" @row-del="rowDel"
+                @expand-change="expandChange" @refresh-change="refreshChange"
+                @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 274.4)"
+                @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 274.4)" :page.sync="page">
                 <template slot-scope="{ row }" slot="expand">
                     <avue-crud :data="row.itemData" :option="itemOption" :table-loading="row.itemLoading"
-                               :cell-style="cellStyle"
-                               class="itemTable"></avue-crud>
+                        :cell-style="cellStyle" class="itemTable"></avue-crud>
                 </template>
                 <template slot-scope="{ row }" slot="status">
-          <span v-for="(item, index) in orderStatusList" :key="index">
-            <span v-if="item.dictKey == row.status" :style="{ background: item.colour }" class="bottomBox">
-              {{ item.dictValue }}
-            </span>
-          </span>
+                    <span v-for="(item, index) in orderStatusList" :key="index">
+                        <span v-if="item.dictKey == row.status" :style="{ background: item.colour }" class="bottomBox">
+                            {{ item.dictValue }}
+                        </span>
+                    </span>
                 </template>
                 <template slot-scope="{ row }" slot="actualPaymentStatus">
-          <span v-for="(item, index) in actualStatusList" :key="index">
-            <span v-if="item.dictKey == row.actualPaymentStatus" :style="{ background: item.colour }" class="bottomBox">
-              {{ item.dictValue }}
-            </span>
-          </span>
+                    <span v-for="(item, index) in actualStatusList" :key="index">
+                        <span v-if="item.dictKey == row.actualPaymentStatus" :style="{ background: item.colour }"
+                            class="bottomBox">
+                            {{ item.dictValue }}
+                        </span>
+                    </span>
                 </template>
                 <template slot-scope="{ row }" slot="returnsStatus">
-          <span v-for="(item, index) in returnStatusList" :key="index">
-            <span v-if="item.dictKey == row.returnsStatus" :style="{ background: item.colour }" class="bottomBox">
-              {{ item.dictValue }}
-            </span>
-          </span>
+                    <span v-for="(item, index) in returnStatusList" :key="index">
+                        <span v-if="item.dictKey == row.returnsStatus" :style="{ background: item.colour }"
+                            class="bottomBox">
+                            {{ item.dictValue }}
+                        </span>
+                    </span>
                 </template>
                 <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 != 0 && row.numberRows >= 1"
-                               @click="$refs.crud.rowDel(row, index)">删除
+                        @click="$refs.crud.rowDel(row, index)">删除
                     </el-button>
                 </template>
                 <template slot="corpNameSearch">
@@ -51,12 +52,12 @@
                     <el-button type="warning" icon="el-icon-download" size="small" @click="outExport">导出</el-button>
                 </template>
                 <template slot-scope="{ row, index }" slot="ordNo">
-          <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 2)">{{ row.ordNo }}
-          </span>
+                    <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 2)">{{ row.ordNo }}
+                    </span>
                 </template>
                 <template slot-scope="{ row, index }" slot="srcOrdNo">
-          <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 3)">{{ row.srcOrdNo }}
-          </span>
+                    <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 3)">{{ row.srcOrdNo }}
+                    </span>
                 </template>
 
             </avue-crud>
@@ -66,10 +67,10 @@
 </template>
 
 <script>
-import {getList, remove} from "@/api/storehouse/plan.js";
+import { getList, remove } from "@/api/storehouse/plan.js";
 import detailsPage from "./detailsPage"
-import {getDetails} from "@/api/tirePartsMall/salesManagement/saleOrder";
-import {getToken} from "@/util/auth";
+import { getDetails } from "@/api/tirePartsMall/salesManagement/saleOrder";
+import { getToken } from "@/util/auth";
 
 export default {
     name: "index",
@@ -227,7 +228,7 @@ export default {
                 size: "small",
                 menuWidth: 50,
                 searchSpan: 6,
-                searchMenuSpan: 12,
+                searchMenuSpan: 6,
                 searchIcon: true,
                 searchIndex: 3,
                 highlightCurrentRow: true,
@@ -251,158 +252,158 @@ export default {
                     search: true,
                     overHidden: true,
                 },
-                    {
-                        label: '货主',
-                        prop: "customerName",
-                        type: 'select',
-                        search: true,
-                        overHidden: true,
-                        cell: true,
-                        width: 100,
-                        filterable: true,
-                        remote: true,
-                        props: {
-                            label: 'cname',
-                            value: 'cname',
-                            res: 'data.records'
-                        },
-                        dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&cname={{key}}',
-                    },
-                    {
-                        label: '仓库',
-                        prop: "storageName",
-                        search: true,
-                        // remote:true,
-                        overHidden: true,
-                        width: 100,
-                        type: 'select',
-                        props: {
-                            label: 'cname',
-                            value: 'cname'
-                        },
-                        dicUrl: '/api/blade-sales-part/tire/center/warehouse/storage/storageSelectedList?cname={{key}}',
-                    }, {
-                        label: '行数',
-                        prop: "numberRows",
-                        overHidden: true,
-                    },
-                    {
-                        label: '数量',
-                        prop: "goodsTotalNum",
-                        overHidden: true,
-                    }, {
-                        label: '业务日期',
-                        prop: "businesDate",
-                        overHidden: true,
-                        searchProp: "businesDateList",
-                        type: "date",
-                        unlinkPanels: true,
-                        search: true,
-                        width: 100,
-                        searchRange: true,
-                        searchDefaultTime: ["00:00:00", "23:59:59"],
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd HH:mm:ss"
-                    },
-                    {
-                        label: '状态',
-                        prop: "status",
-                        search: true,
-                        overHidden: true,
-                        type: 'select',
-                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=center_plan_status",
-                        props: {
-                            label: "dictValue",
-                            value: "dictKey"
-                        }
+                {
+                    label: '货主',
+                    prop: "customerName",
+                    type: 'select',
+                    search: true,
+                    overHidden: true,
+                    cell: true,
+                    width: 100,
+                    filterable: true,
+                    remote: true,
+                    props: {
+                        label: 'cname',
+                        value: 'cname',
+                        res: 'data.records'
                     },
-                    {
-                        label: '结算状态',
-                        prop: "actualPaymentStatus",
-                        searchProp: 'actualPaymentType',
-                        search: true,
-                        overHidden: true,
-                        type: 'select',
-                        dicData: [
-                            {
-                                label: "待付款",
-                                value: 1
-                            },
-                            {
-                                label: "已付款",
-                                value: 2
-                            }
-                        ],
-                        // dicUrl: "/api/blade-system/dict-biz/dictionary?code=settlement_Status",
-                        // props: {
-                        //   label: "dictValue",
-                        //   value: "dictKey"
-                        // }
+                    dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&cname={{key}}',
+                },
+                {
+                    label: '仓库',
+                    prop: "storageName",
+                    search: true,
+                    // remote:true,
+                    overHidden: true,
+                    width: 100,
+                    type: 'select',
+                    props: {
+                        label: 'cname',
+                        value: 'cname'
                     },
-                    // {
-                    //   label: '应结日期',
-                    //   prop: "dueDate",
-                    //   overHidden: true,
-                    // },
-                    /*        {
-                              label: '备注',
-                              prop: "remarks",
-                              overHidden: true,
-                            },*/
-                    {
-                        label: "制单人",
-                        prop: "createUser",
-                        searchProp: "createUser",
-                        width: 80,
-                        filterable: true,
-                        remote: true,
-                        search: true,
-                        overHidden: true,
-                        type: "select",
-                        dicUrl: "/api/blade-user/page?size=20&current=1&account={{key}}",
-                        props: {
-                            label: "account",
-                            value: "id",
-                            res: 'data.records'
-                        }
-                    }, {
-                        label: "制单日期",
-                        prop: "createTime",
-                        searchProp: "createTimeList",
-                        type: "date",
-                        overHidden: true,
-                        width: 100,
-                        searchRange: true,
-                        searchDefaultTime: ["00:00:00", "23:59:59"],
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd HH:mm:ss"
-                    }, {
-                        label: "更新人",
-                        prop: "updateUserName",
-                        searchProp: "updateUser",
-                        overHidden: true,
-                        width: 100,
-                        filterable: true,
-                        remote: true,
-                        type: "select",
-                        dicUrl: "/api/blade-user/page?size=20&current=1&account={{key}}",
-                        props: {
-                            label: "account",
-                            value: "id",
-                            res: 'data.records'
+                    dicUrl: '/api/blade-sales-part/tire/center/warehouse/storage/storageSelectedList?cname={{key}}',
+                }, {
+                    label: '行数',
+                    prop: "numberRows",
+                    overHidden: true,
+                },
+                {
+                    label: '数量',
+                    prop: "goodsTotalNum",
+                    overHidden: true,
+                }, {
+                    label: '业务日期',
+                    prop: "businesDate",
+                    overHidden: true,
+                    searchProp: "businesDateList",
+                    type: "date",
+                    unlinkPanels: true,
+                    search: true,
+                    width: 100,
+                    searchRange: true,
+                    searchDefaultTime: ["00:00:00", "23:59:59"],
+                    format: "yyyy-MM-dd",
+                    valueFormat: "yyyy-MM-dd HH:mm:ss"
+                },
+                {
+                    label: '状态',
+                    prop: "status",
+                    search: true,
+                    overHidden: true,
+                    type: 'select',
+                    dicUrl: "/api/blade-system/dict-biz/dictionary?code=center_plan_status",
+                    props: {
+                        label: "dictValue",
+                        value: "dictKey"
+                    }
+                },
+                {
+                    label: '结算状态',
+                    prop: "actualPaymentStatus",
+                    searchProp: 'actualPaymentType',
+                    search: true,
+                    overHidden: true,
+                    type: 'select',
+                    dicData: [
+                        {
+                            label: "待付款",
+                            value: 1
+                        },
+                        {
+                            label: "已付款",
+                            value: 2
                         }
-                    }, {
-                        label: "更新日期",
-                        prop: "updateTime",
-                        searchProp: "updateTimeList",
-                        type: "date",
-                        overHidden: true,
-                        width: 100,
-                        searchRange: true,
-                        searchDefaultTime: ["00:00:00", "23:59:59"],
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd HH:mm:ss"
-                    }]
+                    ],
+                    // dicUrl: "/api/blade-system/dict-biz/dictionary?code=settlement_Status",
+                    // props: {
+                    //   label: "dictValue",
+                    //   value: "dictKey"
+                    // }
+                },
+                // {
+                //   label: '应结日期',
+                //   prop: "dueDate",
+                //   overHidden: true,
+                // },
+                /*        {
+                          label: '备注',
+                          prop: "remarks",
+                          overHidden: true,
+                        },*/
+                {
+                    label: "制单人",
+                    prop: "createUser",
+                    searchProp: "createUser",
+                    width: 80,
+                    filterable: true,
+                    remote: true,
+                    search: true,
+                    overHidden: true,
+                    type: "select",
+                    dicUrl: "/api/blade-user/page?size=20&current=1&account={{key}}",
+                    props: {
+                        label: "account",
+                        value: "id",
+                        res: 'data.records'
+                    }
+                }, {
+                    label: "制单日期",
+                    prop: "createTime",
+                    searchProp: "createTimeList",
+                    type: "date",
+                    overHidden: true,
+                    width: 100,
+                    searchRange: true,
+                    searchDefaultTime: ["00:00:00", "23:59:59"],
+                    format: "yyyy-MM-dd",
+                    valueFormat: "yyyy-MM-dd HH:mm:ss"
+                }, {
+                    label: "更新人",
+                    prop: "updateUserName",
+                    searchProp: "updateUser",
+                    overHidden: true,
+                    width: 100,
+                    filterable: true,
+                    remote: true,
+                    type: "select",
+                    dicUrl: "/api/blade-user/page?size=20&current=1&account={{key}}",
+                    props: {
+                        label: "account",
+                        value: "id",
+                        res: 'data.records'
+                    }
+                }, {
+                    label: "更新日期",
+                    prop: "updateTime",
+                    searchProp: "updateTimeList",
+                    type: "date",
+                    overHidden: true,
+                    width: 100,
+                    searchRange: true,
+                    searchDefaultTime: ["00:00:00", "23:59:59"],
+                    format: "yyyy-MM-dd",
+                    valueFormat: "yyyy-MM-dd HH:mm:ss"
+                }]
             }
         }
     },
@@ -411,7 +412,7 @@ export default {
             console.log(this.$route.query, 400);
             if (this.$route.query.srcId) {
                 this.$store.commit("IN_LTCG_STATUS");
-                this.editOpen({id: this.$route.query.srcId}, 1)
+                this.editOpen({ id: this.$route.query.srcId }, 1)
             }
             // 主页快捷跳转来的 直接打开新建订单
             if (this.$route.query.showTrue) {
@@ -419,11 +420,11 @@ export default {
                 this.detailsOpen = true;
             }
             if (this.$route.query.check) {
-                this.editOpen({id: this.$route.query.check.srcBillId}, 1)
+                this.editOpen({ id: this.$route.query.check.srcBillId }, 1)
                 this.$store.commit("IN_LTCG_STATUS");
             }
             if (this.$route.query.type == 'F') {
-                this.editOpen({id: this.$route.query.detail.srcParentId}, 1)
+                this.editOpen({ id: this.$route.query.detail.srcParentId }, 1)
             }
             this.detailData = {
                 id: this.$route.query.check.billId,
@@ -453,7 +454,7 @@ export default {
         // 导出
         outExport() {
             console.log(this.search, 412)
-            let config = {params: {...this.search}}
+            let config = { params: { ...this.search } }
             if (config.params) {
                 for (const propName of Object.keys(config.params)) {
                     const value = config.params[propName];
@@ -516,7 +517,7 @@ export default {
                 cancelButtonText: '取消',
                 type: 'warning'
             }).then(() => {
-                remove({id: form.id}).then(res => {
+                remove({ id: form.id }).then(res => {
                     this.$message({
                         type: 'success',
                         message: '删除成功!'
@@ -564,7 +565,7 @@ export default {
         },
         expandChange(row) {
             if (!row.itemData) {
-                getDetails({id: row.id})
+                getDetails({ id: row.id })
                     .then(res => {
                         this.dataList[row.$index].itemData = res.data.data.orderItemsList;
                     })

+ 10 - 4
src/views/storehouse/outStockManage/outStockPlan/index.vue

@@ -52,6 +52,13 @@
           <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 2)">{{ row.ordNo }}
           </span>
         </template>
+        <template slot-scope="{ row }" slot="status">
+          <span v-for="(item, index) in orderStatusList" :key="index">
+            <span v-if="item.dictKey == row.status" :style="{ background: item.colour }" class="bottomBox">
+              {{ item.dictValue }}
+            </span>
+          </span>
+        </template>
         <template slot-scope="{ row, index }" slot="srcOrdNo">
           <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 3)">{{ row.srcOrdNo }}
           </span>
@@ -64,7 +71,7 @@
 </template>
 
 <script>
-import { getList, remove} from "@/api/storehouse/plan.js";
+import { getList, remove } from "@/api/storehouse/plan.js";
 import detailsPage from "./detailsPage"
 import { getDetails } from "@/api/tirePartsMall/salesManagement/saleOrder";
 import { getToken } from "@/util/auth";
@@ -275,7 +282,7 @@ export default {
           prop: "numberRows",
           overHidden: true,
         }
-        , {
+          , {
           label: '数量',
           prop: "goodsTotalNum",
           overHidden: true,
@@ -472,9 +479,8 @@ export default {
     //   this.option.searchMenuSpan = num * 8;
     //   this.option.searchMenuPosition = "right";
     // }
-    this.getWorkDicts("sales_Status").then(res => {
+    this.getWorkDicts("center_plan_status").then(res => {
       this.orderStatusList = res.data.data
-      console.log(this.orderStatusList);
     });
     this.getWorkDicts("settlement_Status").then(res => {
       this.actualStatusList = res.data.data