修改bug

src/api/basicData/basicStorageType.js

@@ -11,7 +11,7 @@ export function customerList(data) {
 //客户类别列表修改和新增
 export function typeSave(data) {
     return request({
-        url: '/api/blade-client/storagedesc/submitType',
+        url: '/api/blade-client/storagcangedesc/submitType',
         method: 'post',
         data: data
     })

src/components/fee-info/main.vue

@@ -565,16 +565,20 @@ export default {
     },
     //新增
     rowAdd() {
-      console.log(this.$parent.$data.form.corpId);
-      console.log(this.corpList.find(item => this.$parent.$data.form.corpId == item.id).cname);
+      // console.log(this.$parent.$data.form.corpId);
+      // console.log(this.corpList.find(item => this.$parent.$data.form.corpId == item.id).cname);
       if (this.inCropId) {
         let corpName = ''
         if (!this.corpId) {
           corpName = this.corpList.find(item => this.$parent.$data.form.corpId == item.id).cname;
         }
+        if (this.corpId) {
+          corpName = this.corpList.find(item => this.corpId == item.id).cname;
+        }
         const params = {
           feesType: this.selectTab,
           corpId: this.corpId ? this.corpId : corpName,
+          // corpId: this.corpId ? this.corpId : '',
           corpName: this.corpId ? corpName : '',
           quantity:"1.000000",
           currency:this.$parent.$data.form.currency,

src/views/businessManagement/salesOrder/configuration/commoditys.json

@@ -0,0 +1,180 @@
+{
+  "align": "center",
+  "height": "auto",
+  "calcHeight": 80,
+  "stripe": true,
+  "tip": false,
+  "addBtn": false,
+  "searchShow": true,
+  "searchShowBtn": false,
+  "menu": true,
+  "viewBtn": false,
+  "editBtn": false,
+  "delBtn": false,
+  "menuWidth": 80,
+  "searchSpan": 8,
+  "searchMenuSpan": 8,
+  "searchMenuPosition": "right",
+  "border": true,
+  "index": true,
+  "selection": true,
+  "dialogClickModal": false,
+  "column": [
+    {
+      "label": "商品编码",
+      "prop": "code",
+      "search": true,
+      "width": 100,
+      "overHidden": true,
+      "rules": [
+        {
+          "required": true,
+          "message": " ",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "商品名称",
+      "prop": "cname",
+      "slot": true,
+      "search": true,
+      "width": 100,
+      "overHidden": true,
+      "rules": [
+        {
+          "required": true,
+          "message": " ",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "仓库",
+      "prop": "code",
+      "search": true,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "库区",
+      "prop": "code",
+      "search": true,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "数量",
+      "prop": "code",
+      "search": true,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "订货数量",
+      "prop": "orderQuantity",
+      "slot": true,
+      "overHidden": true,
+      "width": 120
+    },
+    {
+      "label": "商品类别",
+      "prop": "goodsTypeName",
+      "hide": true,
+      "addDisabled": false,
+      "multiple": true,
+      "overHidden": true,
+      "rules": [{
+        "required": true,
+        "message": " ",
+        "trigger": "click"
+      }]
+    },
+    {
+      "label": "规格",
+      "prop": "typeno",
+      "search": false,
+      "overHidden": true
+    },
+    {
+      "label": "负荷指数",
+      "prop": "specsOne",
+      "slot": true,
+      "overHidden": true
+    },
+    {
+      "label": "速级",
+      "prop": "specsTwo",
+      "slot": true,
+      "overHidden": true
+    },
+    {
+      "label": "品牌",
+      "prop": "brand",
+      "slot": true,
+      "overHidden": true
+    },
+    {
+      "label": "花纹",
+      "prop": "brandItem",
+      "slot": true,
+      "overHidden": true
+    },
+    {
+      "label": "尺寸",
+      "prop": "size",
+      "slot": true,
+      "overHidden": true
+    },
+    {
+      "label": "产品类别",
+      "prop": "category",
+      "slot": true,
+      "overHidden": true
+    },
+    {
+      "label": "产品分类",
+      "prop": "categoryitem",
+      "slot": true,
+      "overHidden": true
+    },
+    {
+      "label": "供应商",
+      "prop": "corpName",
+      "slot": true,
+      "overHidden": true
+    },
+    {
+      "label": "体积",
+      "prop": "cntrVolumn",
+      "slot": true,
+      "overHidden": true
+    },
+    {
+      "label": "重量",
+      "prop": "cartonWeight",
+      "slot": true,
+      "overHidden": true
+    },
+    {
+      "label": "商品图片",
+      "prop": "url",
+      "type": "upload",
+      "listType": "picture-img",
+      "dataType": "string",
+      "action": "/api/blade-resource/oss/endpoint/put-file",
+      "propsHttp": {
+        "res": "data",
+        "url": "link"
+      },
+      "hide": true,
+      "span": 24,
+      "overHidden": true
+    },
+    {
+      "label": "备注",
+      "prop": "remarks",
+      "slot": true
+    }
+  ]
+}

src/views/businessManagement/salesOrder/configuration/customerContact.json

@@ -5,13 +5,13 @@
   "stripe": true,
   "simplePage": true,
   "searchShow": true,
-  "addBtn":false,
-  "editBtn":false,
+  "addBtn": false,
+  "editBtn": false,
   "height": "auto",
   "delBtn": false,
-  "addRowBtn":false,
-  "cellBtn":false,
-  "cancelBtn":false,
+  "addRowBtn": false,
+  "cellBtn": false,
+  "cancelBtn": false,
   "refreshBtn": false,
   "searchMenuSpan": 6,
   "dialogWidth": "60%",
@@ -45,14 +45,15 @@
     {
       "name": "cntrVolumn",
       "type": "sum",
-      "decimals":5
+      "decimals": 5
     }
   ],
-  "column":[{
+  "column": [
+    {
       "label": "产品分类",
       "prop": "priceCategory",
       "index": 1,
-      "width":100,
+      "width": 100,
       "cell": false,
       "overHidden": true,
       "rules": [
@@ -62,11 +63,12 @@
           "trigger": "blur"
         }
       ]
-    },{
+    },
+    {
       "label": "价格类别",
       "prop": "priceType",
       "index": 1,
-      "width":100,
+      "width": 100,
       "cell": false,
       "overHidden": true,
       "rules": [
@@ -76,11 +78,12 @@
           "trigger": "blur"
         }
       ]
-    },{
+    },
+    {
       "label": "商品名称",
       "prop": "cname",
       "index": 1,
-      "width":200,
+      "width": 200,
       "cell": false,
       "slot": true,
       "overHidden": true,
@@ -91,11 +94,12 @@
           "trigger": "blur"
         }
       ]
-    },{
+    },
+    {
       "label": "编码",
       "prop": "code",
       "index": 2,
-      "width":100,
+      "width": 100,
       "cell": false,
       "overHidden": true,
       "rules": [
@@ -105,11 +109,12 @@
           "trigger": "blur"
         }
       ]
-    },{
+    },
+    {
       "label": "规格型号",
       "prop": "typeno",
       "index": 3,
-      "width":150,
+      "width": 150,
       "cell": false,
       "overHidden": true,
       "rules": [
@@ -119,11 +124,12 @@
           "trigger": "blur"
         }
       ]
-    },{
+    },
+    {
       "label": "花纹",
       "prop": "brandItem",
       "index": 4,
-      "width":150,
+      "width": 150,
       "cell": false,
       "overHidden": true,
       "rules": [
@@ -133,93 +139,103 @@
           "trigger": "blur"
         }
       ]
-    },{
-    "label": "订货数量",
-    "prop": "orderQuantity",
-    "index": 5,
-    "width":100,
-    "cell": false,
-    "slot": true,
-    "overHidden": true,
-    "rules": [
-      {
-        "required": false,
-        "message": "请输入订货数量",
-        "trigger": "blur"
-      }
-    ]
-  },{
-    "label": "发货数量",
-    "prop": "actualQuantity",
-    "index": 6,
-    "width":100,
-    "cell": false,
-    "slot": true,
-    "overHidden": true,
-    "rules": [
-      {
-        "required": false,
-        "message": "请输入发货数量",
-        "trigger": "blur"
-      }
-    ]
-  },
+    },
     {
-      "label": "尺寸",
-      "prop": "size",
-      "index": 7,
-      "width":150,
+      "label": "库区",
+      "prop": "storageName",
+      "index": 4,
+      "width": 150,
+      "cell": false,
+      "overHidden": true,
+      "type": "select",
+      "selectOptions": "areaOptions"
+    },
+    {
+      "label": "库存",
+      "prop": "surplusRouteQuantity",
+      "index": 10,
+      "width": 100,
       "cell": false,
       "overHidden": true
-    },{
-      "label": "供应商",
-      "prop": "corpName",
+    },
+    {
+      "label": "订货数量",
+      "prop": "orderQuantity",
+      "index": 7,
+      "width": 100,
+      "cell": false,
+      "slot": true,
+      "overHidden": true,
+      "rules": [
+        {
+          "required": false,
+          "message": "请输入订货数量",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "发货数量",
+      "prop": "actualQuantity",
       "index": 8,
-      "width":250,
+      "width": 100,
       "cell": false,
       "slot": true,
       "overHidden": true,
       "rules": [
         {
           "required": false,
-          "message": "请输入供应商",
+          "message": "请输入发货数量",
           "trigger": "blur"
         }
       ]
-    },{
-      "label": "质量胎",
-      "prop": "shopQuality",
+    },
+    {
+      "label": "尺寸",
+      "prop": "size",
       "index": 9,
-      "width":140,
+      "width": 150,
+      "cell": false,
+      "overHidden": true
+    },
+    {
+      "label": "供应商",
+      "prop": "corpName",
+      "index": 10,
+      "width": 250,
       "cell": false,
       "slot": true,
       "overHidden": true,
       "rules": [
         {
           "required": false,
-          "message": "请选择",
+          "message": "请输入供应商",
           "trigger": "blur"
         }
       ]
-    },{
-      "label": "库存",
-      "prop": "storageQuantity",
-      "index": 10,
-      "width":100,
+    },
+    {
+      "label": "质量胎",
+      "prop": "shopQuality",
+      "index": 11,
+      "width": 140,
       "cell": false,
+      "slot": true,
       "overHidden": true,
       "rules": [
         {
           "required": false,
-          "message": "请输入库存",
+          "message": "请选择",
           "trigger": "blur"
         }
       ]
-    },{
+    },
+   
+    {
       "label": "采购价格",
       "prop": "purchaseAmount",
-      "index": 11,
-      "width":100,
+      "index": 12,
+      "width": 100,
       "cell": false,
       "slot": true,
       "overHidden": true,
@@ -234,8 +250,8 @@
     {
       "label": "最新单价",
       "prop": "price",
-      "index": 12,
-      "width":100,
+      "index": 13,
+      "width": 100,
       "cell": false,
       "slot": false,
       "overHidden": true,
@@ -246,11 +262,12 @@
           "trigger": "blur"
         }
       ]
-    },{
+    },
+    {
       "label": "金额",
       "prop": "amount",
-      "index": 13,
-      "width":100,
+      "index": 14,
+      "width": 100,
       "cell": false,
       "overHidden": true,
       "rules": [
@@ -264,8 +281,8 @@
     {
       "label": "积分倍数",
       "prop": "integralMultiples",
-      "index": 14,
-      "width":100,
+      "index": 15,
+      "width": 100,
       "cell": false,
       "overHidden": true,
       "rules": [
@@ -279,8 +296,8 @@
     {
       "label": "赠送积分",
       "prop": "integral",
-      "index": 15,
-      "width":100,
+      "index": 16,
+      "width": 100,
       "cell": false,
       "overHidden": true,
       "rules": [
@@ -294,8 +311,8 @@
     {
       "label": "重量",
       "prop": "cartonWeight",
-      "index": 16,
-      "width":100,
+      "index": 17,
+      "width": 100,
       "cell": false,
       "overHidden": true,
       "rules": [
@@ -309,8 +326,8 @@
     {
       "label": "体积",
       "prop": "cntrVolumn",
-      "index": 17,
-      "width":100,
+      "index": 18,
+      "width": 100,
       "cell": false,
       "overHidden": true,
       "rules": [
@@ -324,9 +341,9 @@
     {
       "label": "备注",
       "prop": "remarks",
-      "index": 18,
+      "index": 19,
       "width": 100,
       "overHidden": true
     }
   ]
-}
+}

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

@@ -24,6 +24,12 @@ export const option = {
       overHidden: true,
     },
     {
+      label: "出厂编码",
+      prop: "code",
+      overHidden: true,
+      search: true
+  },
+    {
       label: "商品分类",
       prop: "goodsTypeName",
       overHidden: true,
@@ -56,7 +62,14 @@ export const option = {
       label: "库存预警",
       prop: "inventoryAlert",
       overHidden: true,
-    }, {
+    }, 
+    {
+      label: "快捷品名查询",
+      prop: "cnameInt",
+      search:true,
+      hide:true,
+      overHidden: true
+  },{
       label: "商品描述",
       prop: "goodsDescription",
       search: false,

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

@@ -313,6 +313,41 @@ export default {
             spinner: 'el-icon-loading',
             background: 'rgba(255,255,255,0.7)'
           });
+          // 获取联系人信息和地址信息的数据列表
+          const contacts = this.form.corpsAttnList;
+          const addresses = this.form.corpsAddrList;
+          console.log(contacts);
+          console.log(addresses);
+             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.address) {
+          //     // 联系人地址为空，阻止保存并显示错误提示
+          //     this.$message.error('联系人地址不能为空');
+          //     return;
+          //   }
+          // }
+
+          // // 验证地址信息
+          // for (const address of addresses) {
+          //   if (!address.address) {
+          //     // 地址为空，阻止保存并显示错误提示
+          //     this.$message.error('地址不能为空');
+          //     return;
+          //   }
+          // }
+
           submit({
             ...this.form,
             corpType: "GYS"

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

@@ -111,26 +111,26 @@ export default {
             label: "否",
             value: 1
           }],
-          rules: [
-            {
-              required: true,
-              message: " ",
-              trigger: "blur"
-            }
-          ]
+          // rules: [
+          //   {
+          //     required: true,
+          //     message: " ",
+          //     trigger: "blur"
+          //   }
+          // ]
         }, {
           label: "库容",
           prop: "storageCapacity",
           search: true,
           overHidden: true,
           // width: 120,
-          rules: [
-            {
-              required: true,
-              message: " ",
-              trigger: "blur"
-            }
-          ]
+          // rules: [
+          //   {
+          //     required: true,
+          //     message: " ",
+          //     trigger: "blur"
+          //   }
+          // ]
         }, {
           label: "所属公司",
           prop: "salesCompanyId",
@@ -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/detailsPage.vue

@@ -518,6 +518,7 @@ export default {
         } else if (this.onLoad.id) {
             this.refresh(this.onLoad.id, true)
         }
+        
     },
     methods: {
         generateOutbound() {

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

@@ -18,7 +18,7 @@
           :page.sync="page">
         <template slot-scope="{type,size,row,index}" slot="menu">
           <el-button icon="el-icon-view" :size="size" :type="type" @click="check(row)">查看</el-button>
-          <el-button icon="el-icon-delete" :size="size" :type="type" @click="$refs.crud.rowDel(row,index)">删除</el-button>
+          <el-button icon="el-icon-delete" :size="size" :type="type" @click="$refs.crud.rowDel(row,index)" >删除</el-button>
         </template>
         <template slot="corpNameSearch">
           <crop-select v-model="search.corpId" corpType="KH" :refresh="false"></crop-select>