修复bug

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

@@ -65,7 +65,13 @@ export default {
           prop: "accountHolder"
         }, {
           label: '公司名称',
-          prop: "corporateName"
+          prop: "corporateName",
+          type: 'select',
+          dicUrl: "/api/blade-client/corpsattn/get-corp",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            }
         }, {
           label: '币别',
           prop: "currency",

src/views/tirePartsMall/basicData/accountManagement/index.vue

@@ -1,33 +1,18 @@
 <template>
   <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"
-          @search-criteria-switch="searchCriteriaSwitch"
-          @on-load="onLoad"
-          @search-change="searchChange"
-          @row-del="rowDel"
-          @refresh-change="refreshChange"
-          @resetColumn="resetColumnTwo('crud','option','optionList', 265)"
-          @saveColumn="saveColumnTwo('crud','option','optionList', 265)"
-          :page.sync="page">
+      <avue-crud :option="option" :search.sync="search" v-model="form" :table-loading="loading" :data="dataList"
+        ref="crud" :key="key" @search-criteria-switch="searchCriteriaSwitch" @on-load="onLoad"
+        @search-change="searchChange" @row-del="rowDel" @refresh-change="refreshChange"
+        @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 265)"
+        @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 265)" :page.sync="page">
         <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" @click="$refs.crud.rowDel(row,index)">删除
+          <el-button :size="size" :type="type" @click="$refs.crud.rowDel(row, index)">删除
           </el-button>
         </template>
         <template slot="status" slot-scope="{row,index,disabled}">
-          <el-switch
-              active-value="1"
-              inactive-value="0"
-              :disabled="disabled"
-              v-model="row.status">
+          <el-switch active-value="1" inactive-value="0" :disabled="disabled" v-model="row.status">
           </el-switch>
         </template>
         <template slot="corpNameSearch">
@@ -46,9 +31,9 @@
       </avue-crud>
     </basic-container>
     <el-dialog title="导入客户" append-to-body :visible.sync="excelBox" width="555px" :close-on-click-modal="false"
-               v-dialog-drag>
-      <avue-form :option="excelOption" v-model="excelForm" table-loading="excelLoading"
-                 :upload-before="uploadBefore" :upload-after="uploadAfter">
+      v-dialog-drag>
+      <avue-form :option="excelOption" v-model="excelForm" table-loading="excelLoading" :upload-before="uploadBefore"
+        :upload-after="uploadAfter">
         <template slot="excelTemplate">
           <el-button type="primary" @click="derivation">
             点击下载<i class="el-icon-download el-icon--right"></i>
@@ -64,9 +49,9 @@
 </template>
 
 <script>
-import {getList, remove} from "@/api/tirePartsMall/basicData/accountManagement";
+import { getList, remove } from "@/api/tirePartsMall/basicData/accountManagement";
 import detailsPage from "./detailsPage"
-import {getToken} from "@/util/auth";
+import { getToken } from "@/util/auth";
 
 export default {
   name: "index",
@@ -154,12 +139,24 @@ export default {
           prop: "accountType",
           search: true,
           overHidden: true,
-        },  {
+          type: 'select',
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=accountType",
+          props: {
+            label: "dictValue",
+            value: "dictValue"
+          }
+        }, {
           label: '币别',
           prop: "currency",
           search: true,
           overHidden: true,
-        },{
+          type:"select",
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=currency",
+          props: {
+            label: "dictValue",
+            value: "dictKey"
+          },
+        }, {
           label: '账户余额',
           prop: "accountBalance",
           search: false,
@@ -175,7 +172,7 @@ export default {
             label: '是',
             value: 1
           }]
-        } ]
+        }]
       }
     }
   },
@@ -295,6 +292,4 @@ export default {
 }
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

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

@@ -173,22 +173,42 @@ export default {
                             label: 'cname',
                             value: 'id'
                         },
-                        dicUrl: '/api/blade-sales-part/brandDesc/listAll'
+                        dicUrl: '/api/blade-sales-part/brandDesc/listAll',
+                        rules: [{
+                            required: true,
+                            message: " ",
+                            trigger: "blur"
+                        }]
                     },
                     {
                         label: "出厂编码",
                         prop: "code",
                         span: 8,
+                        rules: [{
+                            required: true,
+                            message: " ",
+                            trigger: "blur"
+                        }]
                     },
                     {
                         label: "规格型号",
                         prop: "specificationAndModel",
                         span: 8,
+                        rules: [{
+                            required: true,
+                            message: " ",
+                            trigger: "blur"
+                        }]
                     },
                     {
                         label: "花纹",
                         prop: "brandItem",
                         span: 8,
+                        rules: [{
+                            required: true,
+                            message: " ",
+                            trigger: "blur"
+                        }]
                     },
                     {
                         label: "产地",

src/views/tirePartsMall/basicData/commodityInformation/js/optionList.js

@@ -1,4 +1,4 @@
-import {number} from "echarts"
+import { number } from "echarts"
 
 export const option = {
   searchShow: true,
@@ -28,7 +28,7 @@ export const option = {
       prop: "code",
       overHidden: true,
       search: true
-  },
+    },
     {
       label: "商品分类",
       prop: "goodsTypeName",
@@ -62,14 +62,23 @@ export const option = {
       label: "库存预警",
       prop: "inventoryAlert",
       overHidden: true,
-    }, 
+    }, {
+      label: "是否防爆",
+      prop: "explosionProof",
+      search: true,
+      overHidden: true,
+      hide: true,
+      showColumn: false,
+      type: 'select',
+      dicData: [{
+        label: '否',
+        value: 0
+      }, {
+        label: '是',
+        value: 1
+      }],
+    },
     {
-      label: "快捷品名查询",
-      prop: "cnameInt",
-      search:true,
-      hide:true,
-      overHidden: true
-  },{
       label: "商品描述",
       prop: "goodsDescription",
       search: false,
@@ -108,22 +117,13 @@ export const option = {
         label: '是',
         value: "1"
       }]
-    },
-    {
-      label: "是否防爆",
-      prop: "explosionProof",
+    }, {
+      label: "快捷品名查询",
+      prop: "cnameInt",
       search: true,
-      overHidden: true,
+      searchLabelWidth: 120,
       hide: true,
-      showColumn: false,
-      type: 'select',
-      dicData: [{
-        label: '否',
-        value: 0
-      }, {
-        label: '是',
-        value: 1
-      }],
+      overHidden: true
     }
   ]
 }

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

@@ -40,6 +40,12 @@
               <el-button :size="size" :type="type" @click="editOpen(row, 2)">编辑</el-button>
               <el-button :size="size" :type="type" @click.stop="rowDel(row)">删除</el-button>
             </template>
+            <!-- <template slot="deliveryWarehouseName">
+              <el-select v-model="search.deliveryWarehouseName" filterable clearable size="small" :disabled="disabled">
+                <el-option v-for="(item, index) in WarehouseNameList" :key="index" :label="item.cname" :value="item.id">
+                </el-option>
+              </el-select>
+            </template> -->
           </avue-crud>
         </el-col>
       </el-row>
@@ -79,6 +85,7 @@
 <script>
 import detailsPage from "./detailsPage";
 import { option } from "./js/optionList";
+import {customerListAll} from '@/api/tirePartsMall/basicData/warehouse'
 import {
   getList,
   getCorpType,
@@ -95,6 +102,7 @@ export default {
     return {
       corpTypeVisible: false,
       excelForm: {},
+      WarehouseNameList:[],
       excelOption: {
         submitBtn: false,
         emptyBtn: false,
@@ -261,13 +269,23 @@ export default {
     detailsPage,
     corpType
   },
-  activated(){
+  activated() {
     console.log(1);
     // this.$refs.crud.refreshTable()
   },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(207), option);
     this.getAllWorkDicts()
+
+    this.option = option;
+      const inSave = await this.delColumnData(this.getColumnName(207), option);
+      if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout();
+        });
+        this.getAllWorkDicts()
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
   },
   methods: {
     derivation() {
@@ -470,7 +488,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
 .page-crad ::v-deep .basic-container__card {
   height: 94.2vh;
 }

src/views/tirePartsMall/basicData/customerInformation/js/optionList.js

@@ -35,13 +35,13 @@ export const option = {
     {
       label: "发货仓库",
       prop: "deliveryWarehouseName",
+      type: 'select',
       props: {
         label: 'cname',
-        value: 'id'
+        value: 'cname'
       },
       dicUrl: '/api/blade-sales-part/storageDesc/listAll',
       overHidden: true,
-      type: 'select',
       search: true,
     },
     {

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

@@ -318,35 +318,37 @@ export default {
           const addresses = this.form.corpsAddrList;
           console.log(contacts);
           console.log(addresses);
-             if (!contacts.length) {
+            //  if (!contacts.length) {
+            //   // 联系人地址为空，阻止保存并显示错误提示
+            //   this.$message.error('联系人不能为空');
+            //   loading.close();
+            //   return;
+            // }
+            // if (!addresses.length) {
+            //   // 地址为空，阻止保存并显示错误提示
+            //   this.$message.error('地址不能为空');
+            //   loading.close();
+            //   return;
+            // }
+          // 验证联系人信息
+          for (const contact of contacts) {
+            if (!contact.cname || !contact.tel) {
               // 联系人地址为空，阻止保存并显示错误提示
               this.$message.error('联系人不能为空');
-              loading.close();
+              loading.close()
               return;
             }
-            if (!addresses.length) {
+          }
+
+          // 验证地址信息
+          for (const address of addresses) {
+            if (!address.belongtoarea || !address.detailedAddress) {
               // 地址为空，阻止保存并显示错误提示
               this.$message.error('地址不能为空');
-              loading.close();
+              loading.close()
               return;
             }
-          // 验证联系人信息
-          // for (const contact of contacts) {
-          //   if (!contact.address) {
-          //     // 联系人地址为空，阻止保存并显示错误提示
-          //     this.$message.error('联系人地址不能为空');
-          //     return;
-          //   }
-          // }
-
-          // // 验证地址信息
-          // for (const address of addresses) {
-          //   if (!address.address) {
-          //     // 地址为空，阻止保存并显示错误提示
-          //     this.$message.error('地址不能为空');
-          //     return;
-          //   }
-          // }
+          }
 
           submit({
             ...this.form,

src/views/tirePartsMall/basicData/warehouse/index.vue

@@ -143,13 +143,13 @@ export default {
             value: 'id'
           },
           dicUrl: '/api/blade-system/dept/top-list',
-          // rules: [
-          //   {
-          //     required: true,
-          //     message: " ",
-          //     trigger: "blur"
-          //   }
-          // ]
+          rules: [
+            {
+              required: true,
+              message: " ",
+              trigger: "blur"
+            }
+          ]
         }, {
           label: "备注",
           prop: "remarks",

src/views/tirePartsMall/salesManagement/saleOrder/index.vue

@@ -6,7 +6,7 @@
         @refresh-change="refreshChange" @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 269)"
         @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 269)" :page.sync="page">
         <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" @click="check(row)">查看</el-button> -->
           <el-button :size="size" :type="type" @click="$refs.crud.rowDel(row, index)">删除</el-button>
         </template>
         <template slot="corpNameSearch">
@@ -16,6 +16,14 @@
           <el-button icon="el-icon-plus" type="primary" :size="size" @click="detailsOpen = true">新增</el-button>
           <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>
+        </template>
+        <template slot-scope="{ row, index }" slot="srcOrdNo">
+          <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 3)">{{ row.srcOrdNo }}
+          </span>
+        </template>
       </avue-crud>
     </basic-container>
     <detailsPage v-if="detailsOpen" :onLoad="form" :detailData="detailData" @backToList="backToList"></detailsPage>
@@ -59,7 +67,7 @@ export default {
         searchMenuPosition: "right",
         align: "center",
         size: "small",
-        menuWidth: 100,
+        menuWidth: 50,
         searchSpan: 8,
         searchIcon: true,
         searchIndex: 2,
@@ -222,10 +230,10 @@ export default {
     },
     editOpen(row, status) {
       this.form = row
-      // this.detailData = {
-      //   id: row.id,
-      //   status: status
-      // };
+      this.detailData = {
+        id: row.id,
+        status: status
+      };
       this.detailsOpen = true;
     },
     //刷新