fix:修复商品成本创建、详情的问题

src/apis/service/sellOut/combindAdd/index.js

@@ -19,5 +19,8 @@ export default {
   stock: (data, params) => http(api + 'warelist', data, 'post', params),
   stockinfo: (data, params) => http(api + 'wareinfo', data, 'post', params),
   productinfo: (data, params) => http(api + 'goodupinfo', data, 'post', params),
-  addrquery: (data, params) => http(api + 'addrquery', data, 'post', params)
+  addrquery: (data, params) => http(api + 'addrquery', data, 'post', params),
+  area: (data, params) => http(api + 'area', data, 'post', params),
+  city: (data, params) => http(api + 'city', data, 'post', params),
+  province: (data, params) => http(api + 'province', data, 'post', params)
 };

src/views/goodStore/goodsCost/columns.js

@@ -619,25 +619,25 @@ const basicColumns = [
     prop: 'is_exclusive',
     label: '专属类型',
     _slot_: 'is_exclusive',
-    span: 8
+    span: 6
   },
   {
     prop: 'weight',
     label: '商品总重量',
     _slot_: 'weight',
-    span: 8
+    span: 6
   },
   {
     prop: 'is_stock',
     label: '是否库存品',
     _slot_: 'is_stock',
-    span: 4
+    span: 6
   },
   {
     prop: 'is_combind',
     label: '组合类型',
     _slot_: 'is_combind',
-    span: 4
+    span: 6
   },
   {
     prop: 'noble',

src/views/goodStore/goodsCost/components/baseForm.vue

@@ -58,7 +58,7 @@
                   placeholder="是否组合商品"
                   @change="groupGoodChange"
                 >
-                  <el-option v-if="ruleForm.is_stock === '1'" value="1" label="是组合商品" />
+                  <el-option v-if="ruleForm.is_stock === '1'" value="1" label="组合商品" />
                   <el-option value="0" label="非组合商品" />
                 </el-select>
               </el-form-item>
@@ -496,7 +496,12 @@
             </template>
 
             <template slot-scope="scope">
-              <el-tooltip effect="dark" content="查看" placement="top">
+              <el-tooltip
+                effect="dark"
+                content="查看"
+                placement="top"
+                v-if="editIndex !== scope.$index"
+              >
                 <i class="el-icon-view tb-icon" @click="onChildProdChange(scope.$index, 'view')"></i>
               </el-tooltip>
 

src/views/goodStore/goodsCost/components/productListModal.vue

@@ -3,12 +3,12 @@
     center
     title="选择子商品"
     :visible="_visible"
-    @close="handleClose"
     :close-on-click-modal="false"
     :append-to-body="true"
     width="1024px"
     top="5vh"
     class="child-product"
+    @close="handleClose"
   >
     <ex-table
       v-loading="loading"
@@ -49,7 +49,7 @@
                 :value="brandid"
                 :disabled="false"
                 :size="'mini'"
-                :isDetail="true"
+                :is-detail="true"
                 :names="parmValue.supplierName"
                 :placeholder="'商品品牌'"
                 @searchChange="brandidsearchChange"
@@ -58,11 +58,11 @@
             <el-col :span="6" style="width: 310px; padding: 0 0 0 10px">
               <good-class
                 :value="parmValue.cat_id"
-                @handleChange="goods_class_change"
                 :disabled="false"
                 :size="searchSize"
-                :isDetail="false"
+                :is-detail="false"
                 :placeholder="'分类'"
+                @handleChange="goods_class_change"
               />
             </el-col>
 
@@ -148,8 +148,8 @@
                 :value="supplierNo"
                 :disabled="false"
                 :placeholder="'供应商名称'"
-                :isDetail="false"
-                :noDisabled="true"
+                :is-detail="false"
+                :no-disabled="true"
                 :names="''"
                 @searchChange="supplierChange"
               />
@@ -157,26 +157,26 @@
 
             <el-col :span="4" style="width: 420px">
               <el-input
-                :size="searchSize"
                 v-model="sinput"
+                :size="searchSize"
                 :maxlength="40"
+                placeholder="关键字"
                 @blur="
                   pageInfo.curr = 1;
                   parmValue.page = 1;
                   searchList();
                 "
-                placeholder="关键字"
               >
                 <el-select
-                  v-model="select"
                   slot="prepend"
+                  v-model="select"
                   style="width: 135px"
+                  placeholder="关键字类型"
                   @change="
                     pageInfo.curr = 1;
                     parmValue.page = 1;
                     searchList();
                   "
-                  placeholder="关键字类型"
                 >
                   <el-option label="商品编号" value="1" />
                   <el-option label="商品名称" value="2" />
@@ -189,22 +189,22 @@
 
       <template #spuCode="{ scope }">
         <div style="display:flex;align-items:center">
-          <p>{{scope.row.spuCode}}</p>
+          <p>{{ scope.row.spuCode }}</p>
         </div>
       </template>
 
       <template #good_thumb_img="{ scope }">
         <div
           v-if="scope.row.good_thumb_img"
+          v-viewer
           style="width: 20px; height: 20px"
           class="hover"
-          v-viewer
         >
           <img
             :src="scope.row.good_thumb_img"
             style="display: inline-block; width: 100%; height: 100%"
             alt
-          />
+          >
         </div>
       </template>
       <template #status="{ scope }">
@@ -216,7 +216,13 @@
           v-text="
             (statusList.find((item) => item.code == scope.row.status) || {}).name || '--'
           "
-        ></el-tag>
+        />
+      </template>
+      <template #is_combind="{ scope }">
+        <el-tag
+          size="mini"
+          :type="scope.row.is_combind === '1' ? '' : 'warning'"
+        >{{ scope.row.is_combind === '1' ? '组合商品' : '非组合商品' }}</el-tag>
       </template>
       <template #has_account="{ scope }">
         <el-tag
@@ -233,7 +239,7 @@
               {}
             ).name || '--'
           "
-        ></el-tag>
+        />
       </template>
       <template #isonline="{ scope }">
         <el-tag
@@ -241,9 +247,9 @@
           :type="scope.row.is_online == '0' ? 'warning' : ''"
           v-text="
             (isonlineoptions.find((item) => item.id == scope.row.is_online) || {}).name ||
-            '--'
+              '--'
           "
-        ></el-tag>
+        />
       </template>
       <template #is_stock="{ scope }">
         <el-tag
@@ -252,7 +258,7 @@
           v-text="
             (options4.find((item) => item.id == scope.row.is_stock) || {}).name || '--'
           "
-        ></el-tag>
+        />
       </template>
     </ex-table>
 
@@ -263,32 +269,16 @@
 </template>
 
 <script>
-import { listCol, options1, options4 } from "./../columns";
-import { has_account_list, isStockOptions } from "@/assets/js/statusList";
-import asyncRequest from "@/apis/service/goodStore/goodsCost";
-import mixinPage from "@/mixins/elPaginationHandle";
-import resToken from "@/mixins/resToken";
+import { listCol, options1, options4 } from './../columns'
+import { has_account_list, isStockOptions } from '@/assets/js/statusList'
+import asyncRequest from '@/apis/service/goodStore/goodsCost'
+import mixinPage from '@/mixins/elPaginationHandle'
+import resToken from '@/mixins/resToken'
 
 export default {
-  name: "ProductListModal",
-  props: ["visible"],
+  name: 'ProductListModal',
   mixins: [mixinPage, resToken],
-  computed: {
-    _visible: {
-      get() {
-        return this.visible;
-      },
-      set(nV) {
-        this.$emit("update:visible", nV);
-      }
-    }
-  },
-  watch: {
-    visible(v) {
-      if (!v) return;
-      this.searchList();
-    }
-  },
+  props: ['visible'],
   data() {
     return {
       table: {
@@ -298,32 +288,32 @@ export default {
       },
       loading: false,
       columns: listCol.filter(({ label }) => {
-        return !["操作"].includes(label);
+        return !['操作'].includes(label)
       }),
       selected: [],
       options1,
       options4,
-      size: "mini",
-      searchSize: "mini",
-      tablebtnSize: "mini",
-      sinput: "",
-      select: "1",
+      size: 'mini',
+      searchSize: 'mini',
+      tablebtnSize: 'mini',
+      sinput: '',
+      select: '1',
       parmValue: {
         page: 1, // 页码
         size: 10, // 每页显示条数
-        is_stock: "",
-        start: "",
-        end: "",
-        status: "",
-        good_name: "",
-        spucode: "",
+        is_stock: '',
+        start: '',
+        end: '',
+        status: '',
+        good_name: '',
+        spucode: '',
         cat_id: [],
-        brandid: "",
-        good_type: "",
-        companyNo: "",
-        supplierNo: "",
-        isonline: "",
-        company_name: "" //创建人部门
+        brandid: '',
+        good_type: '',
+        companyNo: '',
+        supplierNo: '',
+        isonline: '',
+        company_name: '' // 创建人部门
       },
       has_account_list,
       isStockOptions,
@@ -333,164 +323,180 @@ export default {
         total: 0
       },
       isonlineoptions: [
-        { id: "0", name: "未上线" },
-        { id: "1", name: "已上线" }
+        { id: '0', name: '未上线' },
+        { id: '1', name: '已上线' }
       ],
       statusList: [
         {
-          code: "0",
-          name: "新建待审核",
-          type: ""
+          code: '0',
+          name: '新建待审核',
+          type: ''
         },
         {
-          code: "1",
-          name: "审核通过",
-          type: "success"
+          code: '1',
+          name: '审核通过',
+          type: 'success'
         },
         {
-          code: "2",
-          name: "基础修改待审核",
-          type: ""
+          code: '2',
+          name: '基础修改待审核',
+          type: ''
         },
         {
-          code: "3",
-          name: "成本修改待审核",
-          type: ""
+          code: '3',
+          name: '成本修改待审核',
+          type: ''
         },
         {
-          code: "4",
-          name: "基础修改驳回",
-          type: "danger"
+          code: '4',
+          name: '基础修改驳回',
+          type: 'danger'
         },
         {
-          code: "5",
-          name: "成本修改驳回",
-          type: "danger"
+          code: '5',
+          name: '成本修改驳回',
+          type: 'danger'
         },
         {
-          code: "6",
-          name: "新建审核驳回",
-          type: "danger"
+          code: '6',
+          name: '新建审核驳回',
+          type: 'danger'
         },
         {
-          code: "7",
-          name: "复制商品待编辑",
-          type: "info"
+          code: '7',
+          name: '复制商品待编辑',
+          type: 'info'
         },
         {
-          code: "8",
-          name: "竞价商品待编辑",
-          type: "info"
+          code: '8',
+          name: '竞价商品待编辑',
+          type: 'info'
         }
       ],
       tableData: []
-    };
+    }
+  },
+  computed: {
+    _visible: {
+      get() {
+        return this.visible
+      },
+      set(nV) {
+        this.$emit('update:visible', nV)
+      }
+    }
+  },
+  watch: {
+    visible(v) {
+      if (!v) return
+      this.searchList()
+    }
   },
   methods: {
     selectionChange(evt) {
-      const { list } = evt;
-      this.selected = list;
+      const { list } = evt
+      this.selected = list
     },
     restSearch() {
-      this.select = "2";
-      this.sinput = "";
-      this.supplierNo = [];
-      this.brandid = [];
+      this.select = '2'
+      this.sinput = ''
+      this.supplierNo = []
+      this.brandid = []
       // 表格 - 分页
       this.pageInfo = {
         size: 15,
         curr: 1,
         total: 0
-      };
+      }
       this.parmValue = {
         page: 1, // 页码
         size: 15, // 每页显示条数
-        start: "",
-        end: "",
-        status: "",
-        good_name: "",
-        company_name: "", //创建人部门
-        spucode: "",
+        start: '',
+        end: '',
+        status: '',
+        good_name: '',
+        company_name: '', // 创建人部门
+        spucode: '',
         cat_id: [],
-        brandid: "",
-        good_type: "",
-        isonline: "",
-        companyNo: "",
-        supplierNo: ""
-      };
-      this.searchList();
+        brandid: '',
+        good_type: '',
+        isonline: '',
+        companyNo: '',
+        supplierNo: ''
+      }
+      this.searchList()
     },
     handleClose() {
-      this.selected = [];
-      this._visible = false;
+      this.selected = []
+      this._visible = false
     },
     proportionChange(proportion) {
-      this.ruleForm.proportion = proportion;
+      this.ruleForm.proportion = proportion
     },
     onSave() {
       if (this.selected.length === 0 || this.selected.length > 1) {
         const message =
-          this.selected.length === 0 ? "请选择一条商品" : "只能选择一条商品";
-        this.$message.warning(message);
-        return;
+          this.selected.length === 0 ? '请选择一条商品' : '只能选择一条商品'
+        this.$message.warning(message)
+        return
       }
 
-      const { spuCode, good_name } = this.selected[0];
-      this.$emit("selected", {
+      const { spuCode, good_name } = this.selected[0]
+      this.$emit('selected', {
         childCode: spuCode,
         child_name: good_name
-      });
-      this._visible = false;
+      })
+      this._visible = false
     },
     async searchList() {
       if (
-        (this.parmValue.start !== "" && this.parmValue.end === "") ||
-        (this.parmValue.start === "" && this.parmValue.end !== "")
+        (this.parmValue.start !== '' && this.parmValue.end === '') ||
+        (this.parmValue.start === '' && this.parmValue.end !== '')
       ) {
-        this.$message.warning("时间区间不完整！");
-        return;
+        this.$message.warning('时间区间不完整！')
+        return
       }
-      this.loading = true;
-      let item = JSON.parse(JSON.stringify(this.parmValue));
-      item.spucode = this.select === "1" ? this.sinput : "";
-      item.good_name = this.select === "2" ? this.sinput : "";
-      item.companyNo = this.select === "3" ? this.sinput : "";
-      item.supplierNo = this.select === "4" ? this.sinput : "";
-      item.company_name = this.select === "5" ? this.sinput : ""; // 部门
+      this.loading = true
+      const item = JSON.parse(JSON.stringify(this.parmValue))
+      item.spucode = this.select === '1' ? this.sinput : ''
+      item.good_name = this.select === '2' ? this.sinput : ''
+      item.companyNo = this.select === '3' ? this.sinput : ''
+      item.supplierNo = this.select === '4' ? this.sinput : ''
+      item.company_name = this.select === '5' ? this.sinput : '' // 部门
       item.cat_id =
-        item.cat_id.length > 0 ? item.cat_id[item.cat_id.length - 1] : "";
+        item.cat_id.length > 0 ? item.cat_id[item.cat_id.length - 1] : ''
       const res = await asyncRequest.list({
         ...item,
-        supplierNo: Array.isArray(this.supplierNo) ? this.supplierNo[0] : "",
+        supplierNo: Array.isArray(this.supplierNo) ? this.supplierNo[0] : '',
         needRela: true,
-        is_stock: "1",
-        status: "1"
-      });
+        is_stock: '1',
+        status: '1',
+        is_combind: '0'
+      })
 
       if (res && res.code === 0 && res.data) {
-        this.tableData = res.data.list;
+        this.tableData = res.data.list
         this.tableData.forEach(a => {
-          a.cat_name = "";
-          let list = a.cat_info || [];
+          a.cat_name = ''
+          const list = a.cat_info || []
           list.forEach((b, i) => {
-            a.cat_name += i == 0 ? b.name : "/" + b.name;
-          });
-        });
-        this.pageInfo.total = Number(res.data.count);
+            a.cat_name += i == 0 ? b.name : '/' + b.name
+          })
+        })
+        this.pageInfo.total = Number(res.data.count)
       } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
+        await this.logout()
       } else {
-        this.tableData = [];
-        this.pageInfo.total = 0;
+        this.tableData = []
+        this.pageInfo.total = 0
       }
       // this.getresultlist();
-      this.loading = false;
+      this.loading = false
     }
   }
-};
+}
 </script>
 
-
 <style lang="scss" scoped>
 .child-product {
   /deep/ .el-pagination {

src/views/goodStore/goodsCost/components/productModal.vue

@@ -18,7 +18,7 @@
         />
 
         <div v-else style="display:flex">
-          <show-data-table :columns="basicColumns" :sitem="sitem">
+          <show-data-table :columns="basicColumns" :sitem="sitem" border>
             <template slot="packing_spec">
               <el-tag
                 size="mini"
@@ -31,6 +31,7 @@
               >{{ ( options3.find(({id}) => id === sitem.is_auth) || {}).name || '--' }}</el-tag>
             </template>
 
+
             <template slot="good_info_img">
               <div style="max-height: 24px; overflow: hidden">
                 <el-image
@@ -49,6 +50,12 @@
               }}
             </template>
 
+            <template slot="is_combind">
+              {{
+                String(sitem.is_combind) === '1' ? '组合商品' : '非组合商品'
+              }}
+            </template>
+
             <template slot="good_name">
               <img
                 v-if="sitem.good_thumb_img"

src/views/goodStore/goodsCost/detail.vue

@@ -35,7 +35,7 @@
 
             <template v-else>
               <el-collapse-item title="基础信息" name="1">
-                <show-data-table :columns="basicColumns" :sitem="sitem">
+                <show-data-table :columns="basicColumns" :sitem="sitem" border>
                   <template slot="good_img">
                     <template v-if="sitem && sitem.good_img">
                       <div style="max-height: 24px; overflow: hidden">
@@ -50,6 +50,12 @@
                     </template>
                   </template>
 
+                  <template slot="is_combind">
+                    {{
+                      String(sitem.is_combind) === '1' ? '组合商品' : '非组合商品'
+                    }}
+                  </template>
+
                   <template slot="packing_spec">
                     <el-tag
                       size="mini"

src/views/goodStore/goodsCost/index.vue

@@ -217,11 +217,12 @@
                 />
               </el-select>
             </el-col>-->
-            <el-col :span="4" style="margin-right:10px">
+            <el-col :span="3" style="margin-right:25px">
               <el-select
+                clearable
                 v-model="parmValue.is_combind"
                 placeholder="组合类型"
-                style="width:100%"
+                style="width:225px"
                 size="mini"
                 @change="
                   pageInfo.curr = 1;
@@ -229,7 +230,7 @@
                   searchList();
                 "
               >
-                <el-option label="是组合商品" value="1" />
+                <el-option label="组合商品" value="1" />
                 <el-option label="非组合商品" value="0" />
               </el-select>
             </el-col>
@@ -321,7 +322,7 @@
         <el-tag
           size="mini"
           :type="scope.row.is_combind === '1' ? '' : 'warning'"
-        >{{scope.row.is_combind === '1' ? '是组合商品' : '非组合商品'}}</el-tag>
+        >{{scope.row.is_combind === '1' ? '组合商品' : '非组合商品'}}</el-tag>
       </template>
       <template #isonline="{ scope }">
         <el-tag
@@ -408,7 +409,7 @@
             (ppowers.some((i) => i == '5') &&
             (scope.row.status + '' === '5' || scope.row.status + '' === '1') &&
             (scope.row.is_stock + '' === '0' || scope.row.is_stock + '' === '1')) &&
-            !isSupertube && String(scope.row.has_account) === '0' 
+            !isSupertube && String(scope.row.has_account) === '0'
           "
           effect="dark"
           content="修改成本信息"

src/views/goodStore/supplierGoodsCost/columns.js

@@ -76,6 +76,12 @@ const listCol = [
     _slot_: 'is_stock',
     width: '85px'
   },
+  {
+    prop: 'is_combind',
+    label: '组合类型',
+    width: '95px',
+    _slot_: 'is_combind'
+  },
   {
     prop: 'isonline',
     label: '是否上线',
@@ -205,7 +211,7 @@ const rules = {
       trigger: 'change'
     }
   ],
-  is_combind:[
+  is_combind: [
     {
       required: true,
       message: '请选择组合类型',
@@ -606,25 +612,25 @@ const basicColumns = [
     prop: 'is_exclusive',
     label: '专属类型',
     _slot_: 'is_exclusive',
-    span: 8
+    span: 6
   },
   {
     prop: 'weight',
     label: '商品总重量',
     _slot_: 'weight',
-    span: 8
+    span: 6
   },
   {
     prop: 'is_stock',
     label: '是否库存品',
     _slot_: 'is_stock',
-    span: 4
+    span: 6
   },
   {
     prop: 'is_combind',
     label: '组合类型',
     _slot_: 'is_combind',
-    span: 4
+    span: 6
   },
   {
     prop: 'noble',

src/views/goodStore/supplierGoodsCost/components/baseForm.vue

@@ -62,7 +62,7 @@
                   placeholder="是否组合商品"
                   @change="groupGoodChange"
                 >
-                  <el-option v-if="ruleForm.is_stock === '1'" value="1" label="是组合商品" />
+                  <el-option v-if="ruleForm.is_stock === '1'" value="1" label="组合商品" />
                   <el-option value="0" label="非组合商品" />
                 </el-select>
               </el-form-item>
@@ -500,7 +500,12 @@
             </template>
 
             <template slot-scope="scope">
-              <el-tooltip effect="dark" content="查看" placement="top">
+              <el-tooltip
+                effect="dark"
+                content="查看"
+                placement="top"
+                v-if="editIndex !== scope.$index"
+              >
                 <i class="el-icon-view tb-icon" @click="onChildProdChange(scope.$index, 'view')"></i>
               </el-tooltip>
 

src/views/goodStore/supplierGoodsCost/components/productListModal.vue

@@ -3,12 +3,12 @@
     center
     title="选择子商品"
     :visible="_visible"
-    @close="handleClose"
     :close-on-click-modal="false"
     :append-to-body="true"
     width="1024px"
     top="5vh"
     class="child-product"
+    @close="handleClose"
   >
     <ex-table
       v-loading="loading"
@@ -49,7 +49,7 @@
                 :value="brandid"
                 :disabled="false"
                 :size="'mini'"
-                :isDetail="true"
+                :is-detail="true"
                 :names="parmValue.supplierName"
                 :placeholder="'商品品牌'"
                 @searchChange="brandidsearchChange"
@@ -58,11 +58,11 @@
             <el-col :span="6" style="width: 310px; padding: 0 0 0 10px">
               <good-class
                 :value="parmValue.cat_id"
-                @handleChange="goods_class_change"
                 :disabled="false"
                 :size="searchSize"
-                :isDetail="false"
+                :is-detail="false"
                 :placeholder="'分类'"
+                @handleChange="goods_class_change"
               />
             </el-col>
 
@@ -148,8 +148,8 @@
                 :value="supplierNo"
                 :disabled="false"
                 :placeholder="'供应商名称'"
-                :isDetail="false"
-                :noDisabled="true"
+                :is-detail="false"
+                :no-disabled="true"
                 :names="''"
                 @searchChange="supplierChange"
               />
@@ -157,26 +157,26 @@
 
             <el-col :span="4" style="width: 420px">
               <el-input
-                :size="searchSize"
                 v-model="sinput"
+                :size="searchSize"
                 :maxlength="40"
+                placeholder="关键字"
                 @blur="
                   pageInfo.curr = 1;
                   parmValue.page = 1;
                   searchList();
                 "
-                placeholder="关键字"
               >
                 <el-select
-                  v-model="select"
                   slot="prepend"
+                  v-model="select"
                   style="width: 135px"
+                  placeholder="关键字类型"
                   @change="
                     pageInfo.curr = 1;
                     parmValue.page = 1;
                     searchList();
                   "
-                  placeholder="关键字类型"
                 >
                   <el-option label="商品编号" value="1" />
                   <el-option label="商品名称" value="2" />
@@ -189,22 +189,22 @@
 
       <template #spuCode="{ scope }">
         <div style="display:flex;align-items:center">
-          <p>{{scope.row.spuCode}}</p>
+          <p>{{ scope.row.spuCode }}</p>
         </div>
       </template>
 
       <template #good_thumb_img="{ scope }">
         <div
           v-if="scope.row.good_thumb_img"
+          v-viewer
           style="width: 20px; height: 20px"
           class="hover"
-          v-viewer
         >
           <img
             :src="scope.row.good_thumb_img"
             style="display: inline-block; width: 100%; height: 100%"
             alt
-          />
+          >
         </div>
       </template>
       <template #status="{ scope }">
@@ -216,7 +216,7 @@
           v-text="
             (statusList.find((item) => item.code == scope.row.status) || {}).name || '--'
           "
-        ></el-tag>
+        />
       </template>
       <template #has_account="{ scope }">
         <el-tag
@@ -233,7 +233,7 @@
               {}
             ).name || '--'
           "
-        ></el-tag>
+        />
       </template>
       <template #isonline="{ scope }">
         <el-tag
@@ -241,9 +241,9 @@
           :type="scope.row.is_online == '0' ? 'warning' : ''"
           v-text="
             (isonlineoptions.find((item) => item.id == scope.row.is_online) || {}).name ||
-            '--'
+              '--'
           "
-        ></el-tag>
+        />
       </template>
       <template #is_stock="{ scope }">
         <el-tag
@@ -252,7 +252,14 @@
           v-text="
             (options4.find((item) => item.id == scope.row.is_stock) || {}).name || '--'
           "
-        ></el-tag>
+        />
+      </template>
+
+      <template #is_combind="{ scope }">
+        <el-tag
+          size="mini"
+          :type="scope.row.is_combind === '1' ? '' : 'warning'"
+        >{{ scope.row.is_combind === '1' ? '组合商品' : '非组合商品' }}</el-tag>
       </template>
     </ex-table>
 
@@ -263,32 +270,16 @@
 </template>
 
 <script>
-import { listCol, options1, options4 } from "./../columns";
-import { has_account_list, isStockOptions } from "@/assets/js/statusList";
-import asyncRequest from "@/apis/service/goodStore/goodsCost";
-import mixinPage from "@/mixins/elPaginationHandle";
-import resToken from "@/mixins/resToken";
+import { listCol, options1, options4 } from './../columns'
+import { has_account_list, isStockOptions } from '@/assets/js/statusList'
+import asyncRequest from '@/apis/service/goodStore/goodsCost'
+import mixinPage from '@/mixins/elPaginationHandle'
+import resToken from '@/mixins/resToken'
 
 export default {
-  name: "ProductListModal",
-  props: ["visible"],
+  name: 'ProductListModal',
   mixins: [mixinPage, resToken],
-  computed: {
-    _visible: {
-      get() {
-        return this.visible;
-      },
-      set(nV) {
-        this.$emit("update:visible", nV);
-      }
-    }
-  },
-  watch: {
-    visible(v) {
-      if (!v) return;
-      this.searchList();
-    }
-  },
+  props: ['visible'],
   data() {
     return {
       table: {
@@ -298,32 +289,32 @@ export default {
       },
       loading: false,
       columns: listCol.filter(({ label }) => {
-        return !["操作"].includes(label);
+        return !['操作'].includes(label)
       }),
       selected: [],
       options1,
       options4,
-      size: "mini",
-      searchSize: "mini",
-      tablebtnSize: "mini",
-      sinput: "",
-      select: "1",
+      size: 'mini',
+      searchSize: 'mini',
+      tablebtnSize: 'mini',
+      sinput: '',
+      select: '1',
       parmValue: {
         page: 1, // 页码
         size: 10, // 每页显示条数
-        is_stock: "",
-        start: "",
-        end: "",
-        status: "",
-        good_name: "",
-        spucode: "",
+        is_stock: '',
+        start: '',
+        end: '',
+        status: '',
+        good_name: '',
+        spucode: '',
         cat_id: [],
-        brandid: "",
-        good_type: "",
-        companyNo: "",
-        supplierNo: "",
-        isonline: "",
-        company_name: "" //创建人部门
+        brandid: '',
+        good_type: '',
+        companyNo: '',
+        supplierNo: '',
+        isonline: '',
+        company_name: '' // 创建人部门
       },
       has_account_list,
       isStockOptions,
@@ -333,161 +324,177 @@ export default {
         total: 0
       },
       isonlineoptions: [
-        { id: "0", name: "未上线" },
-        { id: "1", name: "已上线" }
+        { id: '0', name: '未上线' },
+        { id: '1', name: '已上线' }
       ],
       statusList: [
         {
-          code: "0",
-          name: "新建待审核",
-          type: ""
+          code: '0',
+          name: '新建待审核',
+          type: ''
         },
         {
-          code: "1",
-          name: "审核通过",
-          type: "success"
+          code: '1',
+          name: '审核通过',
+          type: 'success'
         },
         {
-          code: "2",
-          name: "基础修改待审核",
-          type: ""
+          code: '2',
+          name: '基础修改待审核',
+          type: ''
         },
         {
-          code: "3",
-          name: "成本修改待审核",
-          type: ""
+          code: '3',
+          name: '成本修改待审核',
+          type: ''
         },
         {
-          code: "4",
-          name: "基础修改驳回",
-          type: "danger"
+          code: '4',
+          name: '基础修改驳回',
+          type: 'danger'
         },
         {
-          code: "5",
-          name: "成本修改驳回",
-          type: "danger"
+          code: '5',
+          name: '成本修改驳回',
+          type: 'danger'
         },
         {
-          code: "6",
-          name: "新建审核驳回",
-          type: "danger"
+          code: '6',
+          name: '新建审核驳回',
+          type: 'danger'
         },
         {
-          code: "7",
-          name: "复制商品待编辑",
-          type: "info"
+          code: '7',
+          name: '复制商品待编辑',
+          type: 'info'
         },
         {
-          code: "8",
-          name: "竞价商品待编辑",
-          type: "info"
+          code: '8',
+          name: '竞价商品待编辑',
+          type: 'info'
         }
       ],
       tableData: []
-    };
+    }
+  },
+  computed: {
+    _visible: {
+      get() {
+        return this.visible
+      },
+      set(nV) {
+        this.$emit('update:visible', nV)
+      }
+    }
+  },
+  watch: {
+    visible(v) {
+      if (!v) return
+      this.searchList()
+    }
   },
   methods: {
     selectionChange(evt) {
-      const { list } = evt;
-      this.selected = list;
+      const { list } = evt
+      this.selected = list
     },
     restSearch() {
-      this.select = "2";
-      this.sinput = "";
-      this.supplierNo = [];
-      this.brandid = [];
+      this.select = '2'
+      this.sinput = ''
+      this.supplierNo = []
+      this.brandid = []
       // 表格 - 分页
       this.pageInfo = {
         size: 15,
         curr: 1,
         total: 0
-      };
+      }
       this.parmValue = {
         page: 1, // 页码
         size: 15, // 每页显示条数
-        start: "",
-        end: "",
-        status: "",
-        good_name: "",
-        company_name: "", //创建人部门
-        spucode: "",
+        start: '',
+        end: '',
+        status: '',
+        good_name: '',
+        company_name: '', // 创建人部门
+        spucode: '',
         cat_id: [],
-        brandid: "",
-        good_type: "",
-        isonline: "",
-        companyNo: "",
-        supplierNo: ""
-      };
-      this.searchList();
+        brandid: '',
+        good_type: '',
+        isonline: '',
+        companyNo: '',
+        supplierNo: ''
+      }
+      this.searchList()
     },
     handleClose() {
-      this.selected = [];
-      this._visible = false;
+      this.selected = []
+      this._visible = false
     },
     proportionChange(proportion) {
-      this.ruleForm.proportion = proportion;
+      this.ruleForm.proportion = proportion
     },
     onSave() {
       if (this.selected.length === 0 || this.selected.length > 1) {
         const message =
-          this.selected.length === 0 ? "请选择一条商品" : "只能选择一条商品";
-        this.$message.warning(message);
-        return;
+          this.selected.length === 0 ? '请选择一条商品' : '只能选择一条商品'
+        this.$message.warning(message)
+        return
       }
 
-      const { spuCode } = this.selected[0];
-      this.$emit("selected", spuCode);
-      this._visible = false;
+      const { spuCode } = this.selected[0]
+      this.$emit('selected', spuCode)
+      this._visible = false
     },
     async searchList() {
       if (
-        (this.parmValue.start !== "" && this.parmValue.end === "") ||
-        (this.parmValue.start === "" && this.parmValue.end !== "")
+        (this.parmValue.start !== '' && this.parmValue.end === '') ||
+        (this.parmValue.start === '' && this.parmValue.end !== '')
       ) {
-        this.$message.warning("时间区间不完整！");
-        return;
+        this.$message.warning('时间区间不完整！')
+        return
       }
-      this.loading = true;
-      let item = JSON.parse(JSON.stringify(this.parmValue));
-      item.spucode = this.select === "1" ? this.sinput : "";
-      item.good_name = this.select === "2" ? this.sinput : "";
-      item.companyNo = this.select === "3" ? this.sinput : "";
-      item.supplierNo = this.select === "4" ? this.sinput : "";
-      item.company_name = this.select === "5" ? this.sinput : ""; // 部门
+      this.loading = true
+      const item = JSON.parse(JSON.stringify(this.parmValue))
+      item.spucode = this.select === '1' ? this.sinput : ''
+      item.good_name = this.select === '2' ? this.sinput : ''
+      item.companyNo = this.select === '3' ? this.sinput : ''
+      item.supplierNo = this.select === '4' ? this.sinput : ''
+      item.company_name = this.select === '5' ? this.sinput : '' // 部门
       item.cat_id =
-        item.cat_id.length > 0 ? item.cat_id[item.cat_id.length - 1] : "";
+        item.cat_id.length > 0 ? item.cat_id[item.cat_id.length - 1] : ''
       const res = await asyncRequest.list({
         ...item,
         supplierNo: this.currentCompany,
         noRelation: true,
-        is_stock: "1",
-        status: "1"
-      });
+        is_stock: '1',
+        status: '1',
+        is_combind: '0'
+      })
 
       if (res && res.code === 0 && res.data) {
-        this.tableData = res.data.list;
+        this.tableData = res.data.list
         this.tableData.forEach(a => {
-          a.cat_name = "";
-          let list = a.cat_info || [];
+          a.cat_name = ''
+          const list = a.cat_info || []
           list.forEach((b, i) => {
-            a.cat_name += i == 0 ? b.name : "/" + b.name;
-          });
-        });
-        this.pageInfo.total = Number(res.data.count);
+            a.cat_name += i == 0 ? b.name : '/' + b.name
+          })
+        })
+        this.pageInfo.total = Number(res.data.count)
       } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
+        await this.logout()
       } else {
-        this.tableData = [];
-        this.pageInfo.total = 0;
+        this.tableData = []
+        this.pageInfo.total = 0
       }
       // this.getresultlist();
-      this.loading = false;
+      this.loading = false
     }
   }
-};
+}
 </script>
 
-
 <style lang="scss" scoped>
 .child-product {
   /deep/ .el-pagination {

src/views/goodStore/supplierGoodsCost/components/productModal.vue

@@ -18,7 +18,7 @@
         />
 
         <div v-else style="display:flex">
-          <show-data-table :columns="basicColumns" :sitem="sitem">
+          <show-data-table :columns="basicColumns" :sitem="sitem" border>
             <template slot="packing_spec">
               <el-tag
                 size="mini"
@@ -31,6 +31,12 @@
               >{{ ( options3.find(({id}) => id === sitem.is_auth) || {}).name || '--' }}</el-tag>
             </template>
 
+            <template slot="is_combind">
+              {{
+                String(sitem.is_combind) === '1' ? '组合商品' : '非组合商品'
+              }}
+            </template>
+
             <template slot="good_info_img">
               <div style="max-height: 24px; overflow: hidden">
                 <el-image

src/views/goodStore/supplierGoodsCost/detail.vue

@@ -31,7 +31,7 @@
 
             <template v-else>
               <el-collapse-item title="基础信息" name="1">
-                <show-data-table :columns="basicColumns" :sitem="sitem">
+                <show-data-table :columns="basicColumns" :sitem="sitem" border>
                   <template slot="noble">
                     <span v-if="sitem.noble_metal">
                       {{ sitem.noble_weight ? sitem.noble_weight : "0" }}g-{{
@@ -65,7 +65,7 @@
 
                   <template slot="is_combind">
                     {{
-                    String(sitem.is_combind) === '1' ? '是组合商品' : '非组合商品'
+                    String(sitem.is_combind) === '1' ? '组合商品' : '非组合商品'
                     }}
                   </template>
 

src/views/goodStore/supplierGoodsCost/index.vue

@@ -217,11 +217,12 @@
                 />
               </el-select>
             </el-col>-->
-            <el-col :span="4" style="margin-right:10px">
+            <el-col :span="3" style="margin-right:25px">
               <el-select
+                clearable
                 v-model="parmValue.is_combind"
-                placeholder="是否组合商品"
-                style="width:100%"
+                placeholder="组合类型"
+                style="width:225px"
                 size="mini"
                 @change="
                   pageInfo.curr = 1;
@@ -229,8 +230,8 @@
                   searchList();
                 "
               >
-                <el-option label="是组合商品" value="1" />
-                <el-option label="不是组合商品" value="0" />
+                <el-option label="组合商品" value="1" />
+                <el-option label="非组合商品" value="0" />
               </el-select>
             </el-col>
 
@@ -300,6 +301,14 @@
           "
         ></el-tag>
       </template>
+
+      <template #is_combind="{ scope }">
+        <el-tag
+          size="mini"
+          :type="scope.row.is_combind === '1' ? '' : 'warning'"
+        >{{scope.row.is_combind === '1' ? '组合商品' : '非组合商品'}}</el-tag>
+      </template>
+
       <template #has_account="{ scope }">
         <el-tag
           :size="tablebtnSize"
@@ -321,7 +330,7 @@
         <el-tag
           size="mini"
           :type="scope.row.is_combind === '1' ? '' : 'warning'"
-        >{{scope.row.is_combind === '1' ? '是组合商品' : '不是组合商品'}}</el-tag>
+        >{{scope.row.is_combind === '1' ? '组合商品' : '非组合商品'}}</el-tag>
       </template>
       <template #isonline="{ scope }">
         <el-tag
@@ -411,7 +420,7 @@
             (ppowers.some((i) => i == '5') &&
             (scope.row.status + '' === '5' || scope.row.status + '' === '1') &&
             (scope.row.is_stock + '' === '0' || scope.row.is_stock + '' === '1')) &&
-            !isSupertube && String(scope.row.has_account) === '0' 
+            !isSupertube && String(scope.row.has_account) === '0'
           "
           effect="dark"
           content="修改成本信息"

src/views/sellOut/combinedAdd/components/baseForm.vue

@@ -1,14 +1,14 @@
 <template>
   <el-form label-width="90px" size="mini">
-    <el-form-item label="组合商品">
+    <el-form-item v-loading="loading.product" label="组合商品">
       <el-input v-if="!productinfo" placeholder="选择组合商品" @focus="pVisible = true" />
 
-      <div v-else style="display:flex" key="product">
+      <div v-else key="product" style="display:flex">
         <show-data-table border :columns="productColumns" :sitem="productinfo">
           <template slot="packing_spec">
             <el-tag
               size="mini"
-            >{{ ( options6.find(({id}) => id === productinfo && productinfo.supply_area) || {}).name || '--' }}</el-tag>
+            >{{ ( options6.find(({id}) => id === productinfo.supply_area) || {}).name || '--' }}</el-tag>
           </template>
 
           <template slot="is_auth">
@@ -29,9 +29,9 @@
 
           <template slot="cat_info">
             {{
-            productinfo.cat_info
-            ? productinfo.cat_info.map(({ name }) => name).join("_")
-            : "--"
+              productinfo.cat_info
+                ? productinfo.cat_info.map(({ name }) => name).join("_")
+                : "--"
             }}
           </template>
 
@@ -43,7 +43,7 @@
               class="fl"
               :src="productinfo.good_thumb_img"
               alt
-            />
+            >
             <span>{{ productinfo.good_name }}</span>
             <span v-for="(si, i) in productinfo.speclist" :key="si.spec_id + i">
               <span v-if="i !== 0">-</span>
@@ -64,11 +64,11 @@
           <template slot="noble">
             <span v-if="productinfo.noble_metal">
               {{ productinfo.noble_weight ? productinfo.noble_weight : "0" }}g-{{
-              productinfo.noble_name
+                productinfo.noble_name
               }}-{{ productinfo.gold_price ? productinfo.gold_price : "0" }}元/g-{{
-              productinfo.is_gold_price + "" === "0" ? "不" : ""
+                productinfo.is_gold_price + "" === "0" ? "不" : ""
               }}启用实时金价-{{ productinfo.is_diff + "" === "1" ? "有" : "无" }}工差-{{
-              productinfo.config
+                productinfo.config
               }}-{{ productinfo.other_config }}
             </span>
           </template>
@@ -82,12 +82,12 @@
           <template slot="noble_weight">{{ productinfo.noble_weight }}g</template>
           <template slot="is_gold_price">
             {{
-            String(productinfo.is_gold_price) === "1" ? "是" : "否"
+              String(productinfo.is_gold_price) === "1" ? "是" : "否"
             }}
           </template>
           <template slot="is_diff">
             {{
-            String(productinfo.is_diff) === "1" ? "有公差" : "无工差"
+              String(productinfo.is_diff) === "1" ? "有公差" : "无工差"
             }}
           </template>
 
@@ -100,26 +100,26 @@
           <template slot="origin_place">{{ origin_place }}</template>
         </show-data-table>
 
-        <el-tooltip content="重新选择组合商品" placement="top" v-if="type !== 'view'">
+        <el-tooltip v-if="type !== 'view'" content="重新选择组合商品" placement="top">
           <i
             class="el-icon-circle-close"
-            @click="resetProduct"
             style="cursor:pointer;font-size:18px;margin-left:10px"
+            @click="resetProduct"
           />
         </el-tooltip>
       </div>
     </el-form-item>
 
-    <el-form-item label="所在仓库">
+    <el-form-item v-loading="loading.stock" label="所在仓库">
       <el-input v-if="!stockinfo" placeholder="选择所在仓库" @focus="sVisible = true" />
 
-      <div v-else style="display:flex" key="stock">
+      <div v-else key="stock" style="display:flex">
         <show-data-table border :columns="stockColumns" :sitem="stockinfo" />
         <el-tooltip content="重新选择仓库" placement="top">
           <i
             class="el-icon-circle-close"
-            @click="resetStock"
             style="cursor:pointer;font-size:18px;margin-left:10px"
+            @click="resetStock"
           />
         </el-tooltip>
       </div>
@@ -170,7 +170,7 @@
           <template slot-scope="scope">
             <el-tag size="mini">
               {{
-              (isStockOptions.find(({value}) => value === scope.row.goodType) || {}).label || '--'
+                (isStockOptions.find(({value}) => value === scope.row.goodType) || {}).label || '--'
               }}
             </el-tag>
           </template>
@@ -194,16 +194,16 @@
 </template>
 
 <script>
-import StockModal from "./stockModal.vue";
-import ProductModal from "./productModal.vue";
-import asyncRequest from "@/apis/service/sellOut/combindAdd";
-import { stockColumns, productColumns } from "./columnsForm";
-import privateField from "@/mixins/privateField";
+import StockModal from './stockModal.vue'
+import ProductModal from './productModal.vue'
+import asyncRequest from '@/apis/service/sellOut/combindAdd'
+import { stockColumns, productColumns } from './columnsForm'
+import privateField from '@/mixins/privateField'
 
 export default {
-  name: "BaseForm",
-  mixins: [privateField],
+  name: 'BaseForm',
   components: { StockModal, ProductModal },
+  mixins: [privateField],
   data() {
     return {
       stockColumns,
@@ -212,68 +212,103 @@ export default {
       pVisible: false,
       stockinfo: null,
       productinfo: null,
+      loading: {
+        product: false,
+        stock: false
+      },
       ruleForm: {
         stock_moq: 0,
         can_stock: 0
       },
       options6: [
-        { id: "1", name: "全国" },
-        { id: "2", name: "全国除偏远" }
+        { id: '1', name: '全国' },
+        { id: '2', name: '全国除偏远' }
       ],
       options3: [
-        { id: "0", name: "无销售权限" },
-        { id: "1", name: "有销售权限" }
+        { id: '0', name: '无销售权限' },
+        { id: '1', name: '有销售权限' }
       ]
-    };
+    }
   },
   methods: {
     number_change(e) {
-      this.ruleForm[key] = e;
+      this.ruleForm[key] = e
     },
     resetStock() {
-      this.stockinfo = null;
+      this.stockinfo = null
     },
     resetProduct() {
-      this.productinfo = null;
+      this.productinfo = null
+    },
+    async getArea(prop = 'delivery_place') {
+      const chunks = this.sitem[prop].split(',')
+      let { data: province } = await asyncRequest.province()
+      province = province.find(
+        ({ province_code }) => province_code === chunks[0]
+      )
+      let { data: city } = await asyncRequest.city({ code: chunks[0] })
+      city = city.find(({ city_code }) => city_code === chunks[1])
+      const { data: area } = await asyncRequest.area({ code: chunks[1] })
+      return area.find(({ area_code }) => area_code === chunks[2]) || {}
     },
     async handleStockSelected(evt) {
-      const { id } = evt;
-      const { code, data } = await asyncRequest.stockinfo({ id });
-      if (code !== 0) return;
-      const { addr_code, addrs_code } = data;
+      const { id } = evt
+      this.loading.stock = true
+      const { code, data } = await asyncRequest.stockinfo({ id })
+      if (code !== 0) return
+      const { addr_code, addrs_code } = data
 
-      const { city_code: sourceCodeL2, area_code: sourceCodeL3 } = addr_code;
-      const { city_code: targetCodeL2, area_code: targetCodeL3 } = addrs_code;
+      const { city_code: sourceCodeL2, area_code: sourceCodeL3 } = addr_code
+      const { city_code: targetCodeL2, area_code: targetCodeL3 } = addrs_code
 
       const { code: _co1, data: _d1 } = await asyncRequest.addrquery({
         code: sourceCodeL2,
         level: 3
-      });
+      })
 
       const { code: _co2, data: _d2 } = await asyncRequest.addrquery({
         code: targetCodeL2,
         level: 3
-      });
+      })
+
+      this.loading.stock = false
 
       if (_co1 === 0) {
-        const d1 = _d1.find(item => item.code === sourceCodeL3);
-        const { area: _a1, city: _c1, province: _p1 } = (d1 || {}).info || {};
-        data.source = [_p1, _c1, _a1].map(({ name }) => name).join("");
+        const d1 = _d1.find(item => item.code === sourceCodeL3)
+        const { area: _a1, city: _c1, province: _p1 } = (d1 || {}).info || {}
+        data.source = [_p1, _c1, _a1].map(({ name }) => name).join('')
       }
 
       if (_co2 === 0) {
-        const d2 = _d2.find(item => item.code === targetCodeL3);
-        const { area: _a2, city: _c2, province: _p2 } = (d2 || {}).info || {};
-        data.target = [_p2, _c2, _a2].map(({ name }) => name).join("");
+        const d2 = _d2.find(item => item.code === targetCodeL3)
+        const { area: _a2, city: _c2, province: _p2 } = (d2 || {}).info || {}
+        data.target = [_p2, _c2, _a2].map(({ name }) => name).join('')
       }
 
-      this.stockinfo = data;
+      this.stockinfo = data
+    },
+    async getArea(prop = 'delivery_place') {
+      const chunks = this.productinfo[prop].split(',')
+      let { data: province } = await asyncRequest.province()
+      province = province.find(
+        ({ province_code }) => province_code === chunks[0]
+      )
+      let { data: city } = await asyncRequest.city({ code: chunks[0] })
+      city = city.find(({ city_code }) => city_code === chunks[1])
+      let { data: area } = await asyncRequest.area({ code: chunks[1] })
+      area = area.find(({ area_code }) => area_code === chunks[2]) || {}
+      return [province, city, area].map(({ name }) => name).join('')
     },
     async handleProductSelected(spuCode) {
-      const { code, data } = await asyncRequest.productinfo({ spuCode });
-      if (code !== 0) return;
-      this.productinfo = data;
+      this.loading.product = true
+      const { code, data } = await asyncRequest.productinfo({ spuCode })
+      this.productinfo = data
+      this.delivery_place = await this.getArea('delivery_place')
+      this.origin_place = await this.getArea('origin_place')
+      console.log(this.origin_place)
+      this.loading.product = false
+      if (code !== 0) return
     }
   }
-};
+}
 </script>

src/views/sellOut/combinedAdd/components/columnsForm.js

@@ -40,16 +40,6 @@ export default [
 
 
 export const stockColumns = [
-    {
-        label:'所在业务公司',
-        prop:'companyName',
-        span:'12'
-    },
-    {
-        label:'所在供应商公司',
-        prop:'supplierName',
-        span:'12'
-    },
     {
         label:'仓库名称',
         prop:'name',
@@ -65,6 +55,16 @@ export const stockColumns = [
         prop:'mobile',
         span:'6'
     },
+    {
+        label:'所在业务公司',
+        prop:'companyName',
+        span:'12'
+    },
+    {
+        label:'所在供应商公司',
+        prop:'supplierName',
+        span:'12'
+    },
     {
         label:'仓库所在省市区',
         prop:'source',

src/views/sellOut/combinedAdd/components/productModal.vue

@@ -3,12 +3,12 @@
     center
     title="选择子商品"
     :visible="_visible"
-    @close="handleClose"
     :close-on-click-modal="false"
     :append-to-body="true"
     width="1024px"
     top="5vh"
     class="child-product"
+    @close="handleClose"
   >
     <ex-table
       v-loading="loading"
@@ -49,7 +49,7 @@
                 :value="brandid"
                 :disabled="false"
                 :size="'mini'"
-                :isDetail="true"
+                :is-detail="true"
                 :names="parmValue.supplierName"
                 :placeholder="'商品品牌'"
                 @searchChange="brandidsearchChange"
@@ -58,11 +58,11 @@
             <el-col :span="6" style="width: 310px; padding: 0 0 0 10px">
               <good-class
                 :value="parmValue.cat_id"
-                @handleChange="goods_class_change"
                 :disabled="false"
                 :size="searchSize"
-                :isDetail="false"
+                :is-detail="false"
                 :placeholder="'分类'"
+                @handleChange="goods_class_change"
               />
             </el-col>
 
@@ -148,8 +148,8 @@
                 :value="supplierNo"
                 :disabled="false"
                 :placeholder="'供应商名称'"
-                :isDetail="false"
-                :noDisabled="true"
+                :is-detail="false"
+                :no-disabled="true"
                 :names="''"
                 @searchChange="supplierChange"
               />
@@ -157,26 +157,26 @@
 
             <el-col :span="4" style="width: 420px">
               <el-input
-                :size="searchSize"
                 v-model="sinput"
+                :size="searchSize"
                 :maxlength="40"
+                placeholder="关键字"
                 @blur="
                   pageInfo.curr = 1;
                   parmValue.page = 1;
                   searchList();
                 "
-                placeholder="关键字"
               >
                 <el-select
-                  v-model="select"
                   slot="prepend"
+                  v-model="select"
                   style="width: 135px"
+                  placeholder="关键字类型"
                   @change="
                     pageInfo.curr = 1;
                     parmValue.page = 1;
                     searchList();
                   "
-                  placeholder="关键字类型"
                 >
                   <el-option label="商品编号" value="1" />
                   <el-option label="商品名称" value="2" />
@@ -189,22 +189,22 @@
 
       <template #spuCode="{ scope }">
         <div style="display:flex;align-items:center">
-          <p>{{scope.row.spuCode}}</p>
+          <p>{{ scope.row.spuCode }}</p>
         </div>
       </template>
 
       <template #good_thumb_img="{ scope }">
         <div
           v-if="scope.row.good_thumb_img"
+          v-viewer
           style="width: 20px; height: 20px"
           class="hover"
-          v-viewer
         >
           <img
             :src="scope.row.good_thumb_img"
             style="display: inline-block; width: 100%; height: 100%"
             alt
-          />
+          >
         </div>
       </template>
       <template #status="{ scope }">
@@ -216,7 +216,7 @@
           v-text="
             (statusList.find((item) => item.code == scope.row.status) || {}).name || '--'
           "
-        ></el-tag>
+        />
       </template>
       <template #has_account="{ scope }">
         <el-tag
@@ -233,7 +233,7 @@
               {}
             ).name || '--'
           "
-        ></el-tag>
+        />
       </template>
       <template #isonline="{ scope }">
         <el-tag
@@ -241,9 +241,9 @@
           :type="scope.row.is_online == '0' ? 'warning' : ''"
           v-text="
             (isonlineoptions.find((item) => item.id == scope.row.is_online) || {}).name ||
-            '--'
+              '--'
           "
-        ></el-tag>
+        />
       </template>
       <template #is_stock="{ scope }">
         <el-tag
@@ -252,7 +252,7 @@
           v-text="
             (options4.find((item) => item.id == scope.row.is_stock) || {}).name || '--'
           "
-        ></el-tag>
+        />
       </template>
     </ex-table>
 
@@ -263,40 +263,24 @@
 </template>
 
 <script>
-import { has_account_list, isStockOptions } from "@/assets/js/statusList";
-import asyncRequest from "@/apis/service/goodStore/goodsCost";
-import mixinPage from "@/mixins/elPaginationHandle";
-import resToken from "@/mixins/resToken";
+import { has_account_list, isStockOptions } from '@/assets/js/statusList'
+import asyncRequest from '@/apis/service/goodStore/goodsCost'
+import mixinPage from '@/mixins/elPaginationHandle'
+import resToken from '@/mixins/resToken'
 
 export default {
-  name: "ProductListModal",
-  props: ["visible"],
+  name: 'ProductListModal',
   mixins: [mixinPage, resToken],
-  computed: {
-    _visible: {
-      get() {
-        return this.visible;
-      },
-      set(nV) {
-        this.$emit("update:visible", nV);
-      }
-    }
-  },
-  watch: {
-    visible(v) {
-      if (!v) return;
-      this.searchList();
-    }
-  },
+  props: ['visible'],
   data() {
     return {
       options1: [
-        { id: "0", name: "否" },
-        { id: "1", name: "是" }
+        { id: '0', name: '否' },
+        { id: '1', name: '是' }
       ],
       options4: [
-        { id: "0", name: "非库存品" },
-        { id: "1", name: "库存品" }
+        { id: '0', name: '非库存品' },
+        { id: '1', name: '库存品' }
       ],
       table: {
         stripe: true,
@@ -305,27 +289,27 @@ export default {
       },
       loading: false,
       selected: [],
-      size: "mini",
-      searchSize: "mini",
-      tablebtnSize: "mini",
-      sinput: "",
-      select: "1",
+      size: 'mini',
+      searchSize: 'mini',
+      tablebtnSize: 'mini',
+      sinput: '',
+      select: '1',
       parmValue: {
         page: 1, // 页码
         size: 10, // 每页显示条数
-        is_stock: "",
-        start: "",
-        end: "",
-        status: "",
-        good_name: "",
-        spucode: "",
+        is_stock: '',
+        start: '',
+        end: '',
+        status: '',
+        good_name: '',
+        spucode: '',
         cat_id: [],
-        brandid: "",
-        good_type: "",
-        companyNo: "",
-        supplierNo: "",
-        isonline: "",
-        company_name: "" //创建人部门
+        brandid: '',
+        good_type: '',
+        companyNo: '',
+        supplierNo: '',
+        isonline: '',
+        company_name: '' // 创建人部门
       },
       has_account_list,
       isStockOptions,
@@ -335,88 +319,88 @@ export default {
         total: 0
       },
       isonlineoptions: [
-        { id: "0", name: "未上线" },
-        { id: "1", name: "已上线" }
+        { id: '0', name: '未上线' },
+        { id: '1', name: '已上线' }
       ],
       statusList: [
         {
-          code: "0",
-          name: "新建待审核",
-          type: ""
+          code: '0',
+          name: '新建待审核',
+          type: ''
         },
         {
-          code: "1",
-          name: "审核通过",
-          type: "success"
+          code: '1',
+          name: '审核通过',
+          type: 'success'
         },
         {
-          code: "2",
-          name: "基础修改待审核",
-          type: ""
+          code: '2',
+          name: '基础修改待审核',
+          type: ''
         },
         {
-          code: "3",
-          name: "成本修改待审核",
-          type: ""
+          code: '3',
+          name: '成本修改待审核',
+          type: ''
         },
         {
-          code: "4",
-          name: "基础修改驳回",
-          type: "danger"
+          code: '4',
+          name: '基础修改驳回',
+          type: 'danger'
         },
         {
-          code: "5",
-          name: "成本修改驳回",
-          type: "danger"
+          code: '5',
+          name: '成本修改驳回',
+          type: 'danger'
         },
         {
-          code: "6",
-          name: "新建审核驳回",
-          type: "danger"
+          code: '6',
+          name: '新建审核驳回',
+          type: 'danger'
         },
         {
-          code: "7",
-          name: "复制商品待编辑",
-          type: "info"
+          code: '7',
+          name: '复制商品待编辑',
+          type: 'info'
         },
         {
-          code: "8",
-          name: "竞价商品待编辑",
-          type: "info"
+          code: '8',
+          name: '竞价商品待编辑',
+          type: 'info'
         }
       ],
       columns: [
-        { type: "selection", fixed: "left", _noset_: true },
+        { type: 'selection', fixed: 'left', _noset_: true },
         {
-          prop: "spuCode",
-          label: "编号",
-          width: "180px",
-          _slot_: "spuCode"
+          prop: 'spuCode',
+          label: '编号',
+          width: '180px',
+          _slot_: 'spuCode'
         },
         {
-          prop: "good_thumb_img",
-          label: "图片",
-          _slot_: "good_thumb_img",
-          width: "45px"
+          prop: 'good_thumb_img',
+          label: '图片',
+          _slot_: 'good_thumb_img',
+          width: '45px'
         },
         {
-          prop: "good_name",
-          label: "名称",
-          "min-width": "160px"
+          prop: 'good_name',
+          label: '名称',
+          'min-width': '160px'
         },
         {
-          prop: "cat_name",
-          label: "分类"
+          prop: 'cat_name',
+          label: '分类'
         },
         {
-          prop: "brand_name",
-          label: "品牌"
+          prop: 'brand_name',
+          label: '品牌'
         },
         {
-          prop: "is_stock",
-          label: "库存类型",
-          _slot_: "is_stock",
-          width: "85px"
+          prop: 'is_stock',
+          label: '库存类型',
+          _slot_: 'is_stock',
+          width: '85px'
         },
         // {
         //   prop: "is_combind",
@@ -425,172 +409,188 @@ export default {
         //   _slot_: "is_combind"
         // },
         {
-          prop: "isonline",
-          label: "是否上线",
-          _slot_: "isonline",
-          width: "70px"
+          prop: 'isonline',
+          label: '是否上线',
+          _slot_: 'isonline',
+          width: '70px'
         },
         {
-          prop: "status",
-          label: "状态",
-          _slot_: "status",
-          width: "118px"
+          prop: 'status',
+          label: '状态',
+          _slot_: 'status',
+          width: '118px'
         },
         {
-          prop: "has_account",
-          label: "供应商账号",
-          _slot_: "has_account",
-          width: "85px"
+          prop: 'has_account',
+          label: '供应商账号',
+          _slot_: 'has_account',
+          width: '85px'
         },
         {
-          prop: "supplierNo",
-          label: "供应商编号",
-          width: "110px"
+          prop: 'supplierNo',
+          label: '供应商编号',
+          width: '110px'
         },
         {
-          prop: "supplierName",
-          label: "供应商名称",
-          width: "110px"
+          prop: 'supplierName',
+          label: '供应商名称',
+          width: '110px'
         },
         {
-          prop: "companyNo",
-          label: "业务公司编号",
-          width: "110px"
+          prop: 'companyNo',
+          label: '业务公司编号',
+          width: '110px'
         },
         {
-          prop: "companyName",
-          label: "业务公司名称",
-          width: "110px"
+          prop: 'companyName',
+          label: '业务公司名称',
+          width: '110px'
         },
         {
-          prop: "charger_company_name",
-          label: "负责人部门",
-          minWidth: "150px"
+          prop: 'charger_company_name',
+          label: '负责人部门',
+          minWidth: '150px'
         },
 
         {
-          prop: "charger",
-          label: "负责人",
-          width: "70px"
+          prop: 'charger',
+          label: '负责人',
+          width: '70px'
         },
         {
-          prop: "creater",
-          label: "创建人",
-          width: "70px"
+          prop: 'creater',
+          label: '创建人',
+          width: '70px'
         },
 
         {
-          prop: "addtime",
-          label: "创建时间",
-          width: "140px"
+          prop: 'addtime',
+          label: '创建时间',
+          width: '140px'
         }
       ],
       tableData: []
-    };
+    }
+  },
+  computed: {
+    _visible: {
+      get() {
+        return this.visible
+      },
+      set(nV) {
+        this.$emit('update:visible', nV)
+      }
+    }
+  },
+  watch: {
+    visible(v) {
+      if (!v) return
+      this.searchList()
+    }
   },
   methods: {
     selectionChange(evt) {
-      const { list } = evt;
-      this.selected = list;
+      const { list } = evt
+      this.selected = list
     },
     restSearch() {
-      this.select = "2";
-      this.sinput = "";
-      this.supplierNo = [];
-      this.brandid = [];
+      this.select = '2'
+      this.sinput = ''
+      this.supplierNo = []
+      this.brandid = []
       // 表格 - 分页
       this.pageInfo = {
         size: 15,
         curr: 1,
         total: 0
-      };
+      }
       this.parmValue = {
         page: 1, // 页码
         size: 15, // 每页显示条数
-        start: "",
-        end: "",
-        status: "",
-        good_name: "",
-        company_name: "", //创建人部门
-        spucode: "",
+        start: '',
+        end: '',
+        status: '',
+        good_name: '',
+        company_name: '', // 创建人部门
+        spucode: '',
         cat_id: [],
-        brandid: "",
-        good_type: "",
-        isonline: "",
-        companyNo: "",
-        supplierNo: ""
-      };
-      this.searchList();
+        brandid: '',
+        good_type: '',
+        isonline: '',
+        companyNo: '',
+        supplierNo: ''
+      }
+      this.searchList()
     },
     handleClose() {
-      this.selected = [];
-      this._visible = false;
+      this.selected = []
+      this._visible = false
     },
     proportionChange(proportion) {
-      this.ruleForm.proportion = proportion;
+      this.ruleForm.proportion = proportion
     },
     onSave() {
       if (this.selected.length === 0 || this.selected.length > 1) {
         const message =
-          this.selected.length === 0 ? "请选择一条商品" : "只能选择一条商品";
-        this.$message.warning(message);
-        return;
+          this.selected.length === 0 ? '请选择一条商品' : '只能选择一条商品'
+        this.$message.warning(message)
+        return
       }
 
-      const { spuCode } = this.selected[0];
-      this.$emit("selected", spuCode);
-      this._visible = false;
+      const { spuCode } = this.selected[0]
+      this.$emit('selected', spuCode)
+      this._visible = false
     },
     async searchList() {
-      console.log(this.parmValue);
+      console.log(this.parmValue)
       if (
-        (this.parmValue.start !== "" && this.parmValue.end === "") ||
-        (this.parmValue.start === "" && this.parmValue.end !== "")
+        (this.parmValue.start !== '' && this.parmValue.end === '') ||
+        (this.parmValue.start === '' && this.parmValue.end !== '')
       ) {
-        this.$message.warning("时间区间不完整！");
-        return;
+        this.$message.warning('时间区间不完整！')
+        return
       }
-      this.loading = true;
-      let item = JSON.parse(JSON.stringify(this.parmValue));
-      item.spucode = this.select === "1" ? this.sinput : "";
-      item.good_name = this.select === "2" ? this.sinput : "";
-      item.companyNo = this.select === "3" ? this.sinput : "";
-      item.supplierNo = this.select === "4" ? this.sinput : "";
-      item.company_name = this.select === "5" ? this.sinput : ""; // 部门
+      this.loading = true
+      const item = JSON.parse(JSON.stringify(this.parmValue))
+      item.spucode = this.select === '1' ? this.sinput : ''
+      item.good_name = this.select === '2' ? this.sinput : ''
+      item.companyNo = this.select === '3' ? this.sinput : ''
+      item.supplierNo = this.select === '4' ? this.sinput : ''
+      item.company_name = this.select === '5' ? this.sinput : '' // 部门
       item.cat_id =
-        item.cat_id.length > 0 ? item.cat_id[item.cat_id.length - 1] : "";
+        item.cat_id.length > 0 ? item.cat_id[item.cat_id.length - 1] : ''
       const res = await asyncRequest.list({
         ...item,
-        supplierNo: Array.isArray(this.supplierNo) ? this.supplierNo[0] : "",
+        supplierNo: Array.isArray(this.supplierNo) ? this.supplierNo[0] : '',
         needRela: true,
-        is_stock: "1",
-        status: "1"
-      });
+        is_stock: '1',
+        status: '1',
+        is_combind: '1'
+      })
 
       if (res && res.code === 0 && res.data) {
-        this.tableData = res.data.list;
+        this.tableData = res.data.list
         this.tableData.forEach(a => {
-          a.cat_name = "";
-          let list = a.cat_info || [];
+          a.cat_name = ''
+          const list = a.cat_info || []
           list.forEach((b, i) => {
-            a.cat_name += i == 0 ? b.name : "/" + b.name;
-          });
-        });
-        this.pageInfo.total = Number(res.data.count);
+            a.cat_name += i == 0 ? b.name : '/' + b.name
+          })
+        })
+        this.pageInfo.total = Number(res.data.count)
       } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
+        await this.logout()
       } else {
-        this.tableData = [];
-        this.pageInfo.total = 0;
+        this.tableData = []
+        this.pageInfo.total = 0
       }
       // this.getresultlist();
-      this.loading = false;
+      this.loading = false
     }
   }
-};
+}
 </script>
 
-
 <style lang="scss" scoped>
 .child-product {
   /deep/ .el-pagination {