feat:组合商品添加详情

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

@@ -0,0 +1,23 @@
+// 物业管理员
+import http from "@/apis/axios";
+const api = "admin/";
+export default {
+  // 添加
+  add: (data, params) => http(api + "salezxcreate", data, "post", params),
+  // 删除
+  delete: (data, params) => http(api + "Consultdel", data, "post", params),
+  // 分页查询
+  list: (data, params) => http(api + "saledifflist", data, "post", params),
+  // 详情
+  detail: (data, params) => http(api + "salediffinfo", data, "post", params),
+  // 更新
+  update: (data, params) => http(api + "update", data, "post", params),
+  // 修改状态
+  status: (data, params) => http(api + "salediffcheck", data, "post", params),
+  // 通知业务部门
+  fstatus: (data, params) => http(api + "salediffstatus", data, "post", params),
+  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)
+};

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

@@ -16,4 +16,8 @@ export default {
   status: (data, params) => http(api + "salediffcheck", data, "post", params),
   // 通知业务部门
   fstatus: (data, params) => http(api + "salediffstatus", data, "post", params),
+  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)
 };

src/views/goodStore/goodsCost/detail.vue

@@ -59,7 +59,7 @@
                   <template slot="is_auth">
                     <el-tag
                       size="mini"
-                    >{{ ( options3.find(({id}) => id === sitem.is_auth) || {}).name || '--' }}</el-tag>
+                    >{{ (options3.find(({id}) => id === sitem.is_auth) || {}).name || '--' }}</el-tag>
                   </template>
 
                   <template slot="good_info_img">

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

@@ -1,11 +1,128 @@
 <template>
   <el-form label-width="90px" size="mini">
     <el-form-item label="组合商品">
-      <el-input placeholder="选择组合商品" />
+      <el-input v-if="!productinfo" placeholder="选择组合商品" @focus="pVisible = true" />
+
+      <div v-else style="display:flex" key="product">
+        <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>
+          </template>
+
+          <template slot="is_auth">
+            <el-tag
+              size="mini"
+            >{{ ( options3.find(({id}) => id === productinfo.is_auth) || {}).name || '--' }}</el-tag>
+          </template>
+
+          <template slot="good_info_img">
+            <div style="max-height: 24px; overflow: hidden">
+              <el-image
+                style="height: 24px; width: 24px"
+                :src="productinfo.good_info_img"
+                :preview-src-list="[productinfo.good_info_img]"
+              />
+            </div>
+          </template>
+
+          <template slot="cat_info">
+            {{
+            productinfo.cat_info
+            ? productinfo.cat_info.map(({ name }) => name).join("_")
+            : "--"
+            }}
+          </template>
+
+          <template slot="good_name">
+            <img
+              v-if="productinfo.good_thumb_img"
+              v-viewer
+              style="width: 23px; height: 23px; margin: 0 5px 0 0"
+              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>
+              <span v-else>_</span>
+              <span>{{ si.spec_name }}[{{ si.spec_value }}]</span>
+            </span>
+            <el-popover placement="top" width="300" trigger="hover">
+              <ul>
+                <li v-if="newTime !== '' && isDisplayPrivateField('1')">
+                  <span>商品成本编号：</span>
+                  <span>{{ productinfo.spuCode }}</span>
+                </li>
+              </ul>
+              <i slot="reference" class="el-icon-warning-outline fr" />
+            </el-popover>
+          </template>
+
+          <template slot="noble">
+            <span v-if="productinfo.noble_metal">
+              {{ productinfo.noble_weight ? productinfo.noble_weight : "0" }}g-{{
+              productinfo.noble_name
+              }}-{{ productinfo.gold_price ? productinfo.gold_price : "0" }}元/g-{{
+              productinfo.is_gold_price + "" === "0" ? "不" : ""
+              }}启用实时金价-{{ productinfo.is_diff + "" === "1" ? "有" : "无" }}工差-{{
+              productinfo.config
+              }}-{{ productinfo.other_config }}
+            </span>
+          </template>
+
+          <template slot="weight">{{ productinfo.weight }}g</template>
+          <template slot="tax">{{ productinfo.tax }}%</template>
+          <template slot="is_stock">{{ String(productinfo.is_stock) === "0" ? "非库存品" : "库存品" }}</template>
+          <template
+            slot="is_exclusive"
+          >{{ String(productinfo.is_exclusive) === "0" ? "非泰康" : "泰康" }}</template>
+          <template slot="noble_weight">{{ productinfo.noble_weight }}g</template>
+          <template slot="is_gold_price">
+            {{
+            String(productinfo.is_gold_price) === "1" ? "是" : "否"
+            }}
+          </template>
+          <template slot="is_diff">
+            {{
+            String(productinfo.is_diff) === "1" ? "有公差" : "无工差"
+            }}
+          </template>
+
+          <template slot="packing_weight">{{ productinfo.packing_weight }}g</template>
+
+          <template slot="delivery_day">{{ productinfo.delivery_day }}天</template>
+          <template slot="lead_time">{{ productinfo.lead_time }}天</template>
+          <template slot="sample_day">{{ productinfo.sample_day }}天</template>
+          <template slot="delivery_place">{{ delivery_place }}</template>
+          <template slot="origin_place">{{ origin_place }}</template>
+        </show-data-table>
+
+        <el-tooltip content="重新选择组合商品" placement="top" v-if="type !== 'view'">
+          <i
+            class="el-icon-circle-close"
+            @click="resetProduct"
+            style="cursor:pointer;font-size:18px;margin-left:10px"
+          />
+        </el-tooltip>
+      </div>
     </el-form-item>
 
     <el-form-item label="所在仓库">
-      <el-input placeholder="选择所在仓库" />
+      <el-input v-if="!stockinfo" placeholder="选择所在仓库" @focus="sVisible = true" />
+
+      <div v-else style="display:flex" key="stock">
+        <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"
+          />
+        </el-tooltip>
+      </div>
     </el-form-item>
 
     <el-row>
@@ -70,23 +187,92 @@
         <el-button size="mini" type="primary">保存</el-button>
       </div>
     </el-form-item>
+
+    <stock-modal :visible.sync="sVisible" @selected="handleStockSelected" />
+    <product-modal :visible.sync="pVisible" @selected="handleProductSelected" />
   </el-form>
 </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";
+
 export default {
   name: "BaseForm",
+  mixins: [privateField],
+  components: { StockModal, ProductModal },
   data() {
     return {
+      stockColumns,
+      productColumns,
+      sVisible: false,
+      pVisible: false,
+      stockinfo: null,
+      productinfo: null,
       ruleForm: {
         stock_moq: 0,
         can_stock: 0
-      }
+      },
+      options6: [
+        { id: "1", name: "全国" },
+        { id: "2", name: "全国除偏远" }
+      ],
+      options3: [
+        { id: "0", name: "无销售权限" },
+        { id: "1", name: "有销售权限" }
+      ]
     };
   },
   methods: {
     number_change(e) {
       this.ruleForm[key] = e;
+    },
+    resetStock() {
+      this.stockinfo = null;
+    },
+    resetProduct() {
+      this.productinfo = null;
+    },
+    async handleStockSelected(evt) {
+      const { id } = evt;
+      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 { code: _co1, data: _d1 } = await asyncRequest.addrquery({
+        code: sourceCodeL2,
+        level: 3
+      });
+
+      const { code: _co2, data: _d2 } = await asyncRequest.addrquery({
+        code: targetCodeL2,
+        level: 3
+      });
+
+      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("");
+      }
+
+      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("");
+      }
+
+      this.stockinfo = data;
+    },
+    async handleProductSelected(spuCode) {
+      const { code, data } = await asyncRequest.productinfo({ spuCode });
+      if (code !== 0) return;
+      this.productinfo = data;
     }
   }
 };

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

@@ -37,3 +37,242 @@ export default [
         col: "8",
     },
 ]
+
+
+export const stockColumns = [
+    {
+        label:'所在业务公司',
+        prop:'companyName',
+        span:'12'
+    },
+    {
+        label:'所在供应商公司',
+        prop:'supplierName',
+        span:'12'
+    },
+    {
+        label:'仓库名称',
+        prop:'name',
+        span:'12'
+    },
+    {
+        label:'仓库负责人',
+        prop:'contactor_name',
+        span:'6'
+    },
+    {
+        label:'负责人电话',
+        prop:'mobile',
+        span:'6'
+    },
+    {
+        label:'仓库所在省市区',
+        prop:'source',
+        span:12
+    },
+    {
+        label:'仓库所在详细地址',
+        prop:'addr',
+        span:6
+    },
+    {
+        label:'仓库类型',
+        prop:'type_name',
+        span:6
+    },
+    {
+        label:'收发货联系人',
+        prop:'wsm_name',
+        span:8
+    },
+    {
+        label:'联系人职位',
+        prop:'position',
+        span:8
+    },
+    {
+        label:'联系人电话',
+        prop:'wsm_mobile',
+        span:8
+    },
+    {
+        label:'收发货省市区',
+        prop:'target',
+        span:12
+    },
+    {
+        label:'收发货详细地址',
+        prop:'wsm_addr',
+        span:12
+    },
+]
+
+export const productColumns = [
+    {
+      prop: 'cat_info',
+      label: '商品分类',
+      span: 8,
+      _slot_: 'cat_info'
+    },
+    {
+      prop: 'good_img',
+      label: '商品主图',
+      _slot_: 'good_img',
+      span: 8
+    },
+    {
+      prop: 'good_info_img',
+      _slot_: 'good_info_img',
+      label: '详情图片',
+      span: 8
+    },
+    {
+      prop: 'good_name',
+      label: '商品名称',
+      _slot_: 'good_name',
+      span: 24
+    },
+    {
+      prop: 'company',
+      label: '业务公司',
+      span: 12
+    },
+    {
+      prop: 'supplierName',
+      label: '供应商',
+      span: 12
+    },
+    {
+      prop: 'brand_name',
+      label: '商品品牌',
+      span: 6
+    },
+    {
+      prop: 'is_auth',
+      label: '销售权限',
+      _slot_: 'is_auth',
+      span: 6
+    },
+    {
+      prop: 'unit',
+      label: '单位',
+      span: 6
+    },
+    {
+      prop: 'tax',
+      label: '税点',
+      _slot_: 'tax',
+      span: 6
+    },
+    {
+      prop: 'is_exclusive',
+      label: '专属类型',
+      _slot_: 'is_exclusive',
+      span: 8
+    },
+    {
+      prop: 'weight',
+      label: '商品总重量',
+      _slot_: 'weight',
+      span: 8
+    },
+    {
+      prop: 'is_stock',
+      label: '是否库存品',
+      _slot_: 'is_stock',
+      span: 8
+    },
+    {
+      prop: 'noble',
+      _slot_: 'noble',
+      label: '贵金属信息',
+      span: 24
+    },
+    {
+      prop: 'after_sales',
+      label: '售后说明',
+      span: 24
+    },
+    {
+      prop: 'good_remark',
+      label: '商品备注',
+      span: 24
+    },
+    {
+      prop: 'craft_desc',
+      label: '工艺说明',
+      span: 24
+    },
+    {
+      prop: 'packing_way',
+      label: '包装方式',
+      span: 6
+    },
+    {
+      prop: 'packing_spec',
+      label: '装箱规格',
+      span: 6
+    },
+    {
+      prop: 'packing_weight',
+      label: '装箱重量',
+      _slot_: 'packing_weight',
+      span: 6
+    },
+    {
+      prop: 'packing_size',
+      label: '装箱尺寸',
+      span: 6
+    },
+    {
+      prop: 'good_size',
+      label: '装箱尺寸',
+      span: 6
+    },
+    {
+      prop: 'good_bar',
+      label: '商品条形码',
+      span: 6
+    },
+    {
+      prop: 'packing_list',
+      label: '商品清单',
+      span: 12
+    },
+    {
+      prop: 'packing_spec',
+      label: '供货区域',
+      span: 6,
+      _slot_: 'packing_spec'
+    },
+    {
+      prop: 'delivery_day',
+      label: '物流天数',
+      _slot_: 'delivery_day',
+      span: 6
+    },
+    {
+      prop: 'lead_time',
+      label: '供货周期',
+      _slot_: 'lead_time',
+      span: 6
+    },
+    {
+      prop: 'sample_day',
+      label: '调样周期',
+      _slot_: 'sample_day',
+      span: 6
+    },
+    {
+      prop: 'delivery_place',
+      label: '发货地',
+      span: 12,
+      _slot_: 'delivery_place'
+    },
+    {
+      prop: 'origin_place',
+      label: '产地',
+      span: 12,
+      _slot_: 'origin_place'
+    }
+  ]

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

@@ -0,0 +1,600 @@
+<template>
+  <el-dialog
+    center
+    title="选择子商品"
+    :visible="_visible"
+    @close="handleClose"
+    :close-on-click-modal="false"
+    :append-to-body="true"
+    width="1024px"
+    top="5vh"
+    class="child-product"
+  >
+    <ex-table
+      v-loading="loading"
+      :table="table"
+      :data="tableData"
+      :columns="columns"
+      :page="pageInfo"
+      :size="size"
+      @page-curr-change="handlePageChange"
+      @page-size-change="handleSizeChange"
+      @screen-reset="
+        pageInfo.curr = 1;
+        parmValue.page = 1;
+        searchList();
+      "
+      @screen-submit="
+        pageInfo.curr = 1;
+        parmValue.page = 1;
+        searchList();
+      "
+      @selection="selectionChange"
+    >
+      <template #table-header="{}">
+        <div style="width: 100%">
+          <el-row style="padding: 0 0 10px 0px">
+            <el-col :span="6" style="width: 303px">
+              <period-date-picker
+                :type="1"
+                :width="'135px'"
+                :size="searchSize"
+                :start="parmValue.start"
+                :end="parmValue.end"
+                @timeReturned="handleTime"
+              />
+            </el-col>
+            <el-col :span="4" style="width: 135px">
+              <search-brand
+                :value="brandid"
+                :disabled="false"
+                :size="'mini'"
+                :isDetail="true"
+                :names="parmValue.supplierName"
+                :placeholder="'商品品牌'"
+                @searchChange="brandidsearchChange"
+              />
+            </el-col>
+            <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"
+                :placeholder="'分类'"
+              />
+            </el-col>
+
+            <el-col :span="3" class="fr" style="width: 66px; padding: 0 0 0 10px">
+              <el-button type="primary" :size="searchSize" @click="searchList">刷新</el-button>
+            </el-col>
+
+            <el-col :span="3" class="fr" style="width: 66px; padding: 0 0 0 10px">
+              <el-button type="warning" :size="searchSize" @click="restSearch">重置</el-button>
+            </el-col>
+          </el-row>
+          <el-row>
+            <!-- <el-col :span="4" style="width: 226px">
+              <el-select
+                v-model="parmValue.status"
+                filterable
+                clearable
+                :size="searchSize"
+                placeholder="状态"
+                style="width: 100%"
+                @change="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+              >
+                <el-option
+                  v-for="item in statusList"
+                  :key="'status' + item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-col>-->
+            <el-col :span="4" style="width: 145px; padding: 0 0 0 0px">
+              <el-select
+                v-model="parmValue.isonline"
+                filterable
+                clearable
+                :size="searchSize"
+                placeholder="是否上线"
+                style="width: 100%"
+                @change="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+              >
+                <el-option
+                  v-for="item in isonlineoptions"
+                  :key="'isonline' + item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-col>
+
+            <!-- <el-col :span="4" style="width: 135px;margin-left:10px">
+              <el-select
+                v-model="parmValue.is_stock"
+                size="mini"
+                style="width: 100%"
+                placeholder="商品类型"
+                clearable
+                @change="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+              >
+                <el-option
+                  v-for="opt in isStockOptions"
+                  :key="opt.value"
+                  :value="opt.value"
+                  :label="opt.label"
+                />
+              </el-select>
+            </el-col>-->
+            <el-col :span="4" style="margin: 0 10px">
+              <search-supplier
+                :size="'mini'"
+                style="width: 165px"
+                :value="supplierNo"
+                :disabled="false"
+                :placeholder="'供应商名称'"
+                :isDetail="false"
+                :noDisabled="true"
+                :names="''"
+                @searchChange="supplierChange"
+              />
+            </el-col>
+
+            <el-col :span="4" style="width: 420px">
+              <el-input
+                :size="searchSize"
+                v-model="sinput"
+                :maxlength="40"
+                @blur="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+                placeholder="关键字"
+              >
+                <el-select
+                  v-model="select"
+                  slot="prepend"
+                  style="width: 135px"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                  placeholder="关键字类型"
+                >
+                  <el-option label="商品编号" value="1" />
+                  <el-option label="商品名称" value="2" />
+                </el-select>
+              </el-input>
+            </el-col>
+          </el-row>
+        </div>
+      </template>
+
+      <template #spuCode="{ scope }">
+        <div style="display:flex;align-items:center">
+          <p>{{scope.row.spuCode}}</p>
+        </div>
+      </template>
+
+      <template #good_thumb_img="{ scope }">
+        <div
+          v-if="scope.row.good_thumb_img"
+          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 }">
+        <el-tag
+          :size="tablebtnSize"
+          :type="
+            (statusList.find((item) => item.code == scope.row.status) || {}).type || '--'
+          "
+          v-text="
+            (statusList.find((item) => item.code == scope.row.status) || {}).name || '--'
+          "
+        ></el-tag>
+      </template>
+      <template #has_account="{ scope }">
+        <el-tag
+          :size="tablebtnSize"
+          :type="
+            (
+              has_account_list.find((item) => item.code == scope.row.has_account + '') ||
+              {}
+            ).type || '--'
+          "
+          v-text="
+            (
+              has_account_list.find((item) => item.code == scope.row.has_account + '') ||
+              {}
+            ).name || '--'
+          "
+        ></el-tag>
+      </template>
+      <template #isonline="{ scope }">
+        <el-tag
+          :size="tablebtnSize"
+          :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
+          :size="tablebtnSize"
+          :type="scope.row.is_stock == '0' ? 'warning' : ''"
+          v-text="
+            (options4.find((item) => item.id == scope.row.is_stock) || {}).name || '--'
+          "
+        ></el-tag>
+      </template>
+    </ex-table>
+
+    <div style="display:flex;justify-content:flex-end">
+      <el-button size="mini" type="primary" @click="onSave">保 存</el-button>
+    </div>
+  </el-dialog>
+</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";
+
+export default {
+  name: "ProductListModal",
+  props: ["visible"],
+  mixins: [mixinPage, resToken],
+  computed: {
+    _visible: {
+      get() {
+        return this.visible;
+      },
+      set(nV) {
+        this.$emit("update:visible", nV);
+      }
+    }
+  },
+  watch: {
+    visible(v) {
+      if (!v) return;
+      this.searchList();
+    }
+  },
+  data() {
+    return {
+      options1: [
+        { id: "0", name: "否" },
+        { id: "1", name: "是" }
+      ],
+      options4: [
+        { id: "0", name: "非库存品" },
+        { id: "1", name: "库存品" }
+      ],
+      table: {
+        stripe: true,
+        border: true,
+        _defaultHeader_: []
+      },
+      loading: false,
+      selected: [],
+      size: "mini",
+      searchSize: "mini",
+      tablebtnSize: "mini",
+      sinput: "",
+      select: "1",
+      parmValue: {
+        page: 1, // 页码
+        size: 10, // 每页显示条数
+        is_stock: "",
+        start: "",
+        end: "",
+        status: "",
+        good_name: "",
+        spucode: "",
+        cat_id: [],
+        brandid: "",
+        good_type: "",
+        companyNo: "",
+        supplierNo: "",
+        isonline: "",
+        company_name: "" //创建人部门
+      },
+      has_account_list,
+      isStockOptions,
+      pageInfo: {
+        size: 10,
+        curr: 1,
+        total: 0
+      },
+      isonlineoptions: [
+        { id: "0", name: "未上线" },
+        { id: "1", name: "已上线" }
+      ],
+      statusList: [
+        {
+          code: "0",
+          name: "新建待审核",
+          type: ""
+        },
+        {
+          code: "1",
+          name: "审核通过",
+          type: "success"
+        },
+        {
+          code: "2",
+          name: "基础修改待审核",
+          type: ""
+        },
+        {
+          code: "3",
+          name: "成本修改待审核",
+          type: ""
+        },
+        {
+          code: "4",
+          name: "基础修改驳回",
+          type: "danger"
+        },
+        {
+          code: "5",
+          name: "成本修改驳回",
+          type: "danger"
+        },
+        {
+          code: "6",
+          name: "新建审核驳回",
+          type: "danger"
+        },
+        {
+          code: "7",
+          name: "复制商品待编辑",
+          type: "info"
+        },
+        {
+          code: "8",
+          name: "竞价商品待编辑",
+          type: "info"
+        }
+      ],
+      columns: [
+        { type: "selection", fixed: "left", _noset_: true },
+        {
+          prop: "spuCode",
+          label: "编号",
+          width: "180px",
+          _slot_: "spuCode"
+        },
+        {
+          prop: "good_thumb_img",
+          label: "图片",
+          _slot_: "good_thumb_img",
+          width: "45px"
+        },
+        {
+          prop: "good_name",
+          label: "名称",
+          "min-width": "160px"
+        },
+        {
+          prop: "cat_name",
+          label: "分类"
+        },
+        {
+          prop: "brand_name",
+          label: "品牌"
+        },
+        {
+          prop: "is_stock",
+          label: "库存类型",
+          _slot_: "is_stock",
+          width: "85px"
+        },
+        // {
+        //   prop: "is_combind",
+        //   label: "是否组合商品",
+        //   width: "105px",
+        //   _slot_: "is_combind"
+        // },
+        {
+          prop: "isonline",
+          label: "是否上线",
+          _slot_: "isonline",
+          width: "70px"
+        },
+        {
+          prop: "status",
+          label: "状态",
+          _slot_: "status",
+          width: "118px"
+        },
+        {
+          prop: "has_account",
+          label: "供应商账号",
+          _slot_: "has_account",
+          width: "85px"
+        },
+        {
+          prop: "supplierNo",
+          label: "供应商编号",
+          width: "110px"
+        },
+        {
+          prop: "supplierName",
+          label: "供应商名称",
+          width: "110px"
+        },
+        {
+          prop: "companyNo",
+          label: "业务公司编号",
+          width: "110px"
+        },
+        {
+          prop: "companyName",
+          label: "业务公司名称",
+          width: "110px"
+        },
+        {
+          prop: "charger_company_name",
+          label: "负责人部门",
+          minWidth: "150px"
+        },
+
+        {
+          prop: "charger",
+          label: "负责人",
+          width: "70px"
+        },
+        {
+          prop: "creater",
+          label: "创建人",
+          width: "70px"
+        },
+
+        {
+          prop: "addtime",
+          label: "创建时间",
+          width: "140px"
+        }
+      ],
+      tableData: []
+    };
+  },
+  methods: {
+    selectionChange(evt) {
+      const { list } = evt;
+      this.selected = list;
+    },
+    restSearch() {
+      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: "",
+        cat_id: [],
+        brandid: "",
+        good_type: "",
+        isonline: "",
+        companyNo: "",
+        supplierNo: ""
+      };
+      this.searchList();
+    },
+    handleClose() {
+      this.selected = [];
+      this._visible = false;
+    },
+    proportionChange(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;
+      }
+
+      const { spuCode } = this.selected[0];
+      this.$emit("selected", spuCode);
+      this._visible = false;
+    },
+    async searchList() {
+      console.log(this.parmValue);
+      if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start === "" && this.parmValue.end !== "")
+      ) {
+        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 : ""; // 部门
+      item.cat_id =
+        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] : "",
+        needRela: true,
+        is_stock: "1",
+        status: "1"
+      });
+
+      if (res && res.code === 0 && res.data) {
+        this.tableData = res.data.list;
+        this.tableData.forEach(a => {
+          a.cat_name = "";
+          let list = a.cat_info || [];
+          list.forEach((b, i) => {
+            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();
+      } else {
+        this.tableData = [];
+        this.pageInfo.total = 0;
+      }
+      // this.getresultlist();
+      this.loading = false;
+    }
+  }
+};
+</script>
+
+
+<style lang="scss" scoped>
+.child-product {
+  /deep/ .el-pagination {
+    float: left !important;
+  }
+}
+</style>

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

@@ -0,0 +1,354 @@
+<template>
+  <el-dialog
+    class="stock-dialog"
+    top="8vh"
+    title="选择仓库"
+    center
+    :visible="_visible"
+    @close="handleClose"
+    width="1024px"
+  >
+    <ex-table
+      v-loading="loading"
+      :table="table"
+      :data="tableData"
+      :columns="columns"
+      :page="pageInfo"
+      :size="size"
+      @page-curr-change="handlePageChange"
+      @page-size-change="handleSizeChange"
+      @selection="handleSelection"
+      @screen-reset="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+      @screen-submit="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+    >
+      <template #table-header="{}">
+        <div style="width: 100%">
+          <el-row style="padding: 0 0 10px 0px">
+            <!-- 创建时间 -->
+            <el-col :span="18" style="width: 303px; padding: 0">
+              <period-date-picker
+                :start="parmValue.start"
+                :end="parmValue.end"
+                :type="1"
+                :width="'135px'"
+                :title="'创建'"
+                :size="searchSize"
+                @numReturned="numReturned($event, 0)"
+              />
+            </el-col>
+            <el-col :span="18" style="width: 340px; padding: 0">
+              <search-supplier
+                :value="supplierNo"
+                :size="searchSize"
+                :code="parmValue.supplierNo"
+                :placeholder="'供应商公司名称'"
+                :is-detail="false"
+                :disabled="false"
+                :names="''"
+                @searchChange="supplierChange"
+              />
+              <!-- <search-customer
+                  :value="supplierNo"
+                  :size="searchSize"
+
+                  :placeholder="'供应商公司名称'"
+                  :disabled="false"
+                  @searchChange="supplierChange"
+              />-->
+            </el-col>
+
+            <el-col :span="3" style="width: 56px; margin-left: 10px" class="fr">
+              <el-button :size="searchSize" type="primary" @click="searchList">刷新</el-button>
+            </el-col>
+          </el-row>
+          <el-row style="padding: 0">
+            <el-col :span="4" style="width: 120px; padding: 0">
+              <el-select
+                v-model="parmValue.wsm_type"
+                style="width: 100%"
+                clearable
+                :size="searchSize"
+                @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                placeholder="仓库类型"
+              >
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-col>
+            <el-col :span="18" style="width: 420px; padding: 0 0 0 10px">
+              <el-input
+                placeholder="关键字"
+                v-model="input"
+                maxlength="40"
+                :size="searchSize"
+                class="input-with-select"
+              >
+                <el-select v-model="select" slot="prepend" style="width: 125px" placeholder="关键字类型">
+                  <el-option label="仓库编码" value="1"></el-option>
+                  <el-option label="负责人姓名" value="2"></el-option>
+                  <el-option label="负责人手机号" value="3"></el-option>
+                  <el-option label="负责人部门" value="4"></el-option>
+                </el-select>
+                <el-button slot="append" icon="el-icon-search" @click="searchList"></el-button>
+              </el-input>
+            </el-col>
+            <el-col :span="4" style="width: 66px; padding-left: 10px" class="fr">
+              <el-button type="warning" class="fl" :size="searchSize" @click="restSearch">重置</el-button>
+            </el-col>
+          </el-row>
+        </div>
+      </template>
+      <template #status="{ scope }">
+        <el-tag
+          :size="tablebtnSize"
+          :type="scope.row.status == '0' ? 'warning' : ''"
+          v-text="
+              (statusOptions.find((item) => item.id == scope.row.status) || {}).label ||
+              '--'
+            "
+        ></el-tag>
+      </template>
+
+      <template
+        #wsm_type="{scope}"
+      >{{(options.find((item) => item.value === String(scope.row.wsm_type)) || {}).label || '--'}}</template>
+    </ex-table>
+
+    <div style="display:flex;justify-content:flex-end">
+      <el-button size="mini" type="primary" @click="submit">保 存</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import asyncRequest from "@/apis/service/sellOut/zxDiffOrder";
+import mixinPage from "@/mixins/elPaginationHandle";
+export default {
+  name: "StockModal",
+  props: ["visible"],
+  mixins: [mixinPage],
+  computed: {
+    _visible: {
+      get() {
+        return this.visible;
+      },
+      set(nV) {
+        this.$emit("update:visible", nV);
+      }
+    }
+  },
+  data() {
+    return {
+      selected: [],
+      options: [
+        {
+          value: "5",
+          label: "销售仓"
+        },
+        {
+          value: "4",
+          label: "次品仓"
+        }
+      ],
+      searchSize: "mini",
+      select: "",
+      input: "",
+      tableData: [],
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+        _defaultHeader_: []
+      },
+      pageInfo: {
+        size: 10,
+        curr: 1,
+        total: 0
+      },
+      loading: false,
+      parmValue: {
+        supplierNo: "", //供应商编码
+        wsm_code: "", //仓库编码
+        wsm_type: "",
+        start: "", //新建起始时间
+        end: "", //新建结束时间
+        mobile: "", //手机号
+        contactor_name: "", //联系人
+        size: 10,
+        page: 1
+      },
+      tablebtnSize: "mini",
+      statusOptions: [
+        { id: "0", label: "禁用" },
+        { id: "1", label: "启用" }
+      ],
+      columns: [
+        {
+          type: "selection",
+          width: "80px"
+        },
+        {
+          prop: "wsm_code",
+          label: "编号",
+          width: "170px"
+        },
+        {
+          prop: "name",
+          label: "仓库名称",
+          minWidth: "160px"
+        },
+        {
+          prop: "wsm_type",
+          label: "仓库类型",
+          width: "80px",
+          _slot_: "wsm_type"
+        },
+        {
+          prop: "companyNo",
+          label: "业务公司编码",
+          width: "140px"
+        },
+        {
+          prop: "company_name",
+          label: "业务公司",
+          "min-width": "140px"
+        },
+        {
+          prop: "status",
+          label: "状态",
+          width: "60px",
+          // ,
+          _slot_: "status"
+        },
+        {
+          prop: "contactor_name",
+          label: "负责人",
+          minWidth: "70px"
+        },
+        {
+          prop: "mobile",
+          label: "负责人电话",
+          width: "100px"
+        },
+        {
+          prop: "creater",
+          label: "创建人",
+          width: "70px"
+        },
+        {
+          prop: "addtime",
+          label: "创建时间",
+          width: "140px"
+        }
+      ]
+    };
+  },
+  watch: {
+    _visible(nV) {
+      if (!nV) return;
+      this.searchList();
+    }
+  },
+  methods: {
+    handleClose() {
+      this._visible = false;
+    },
+    submit() {
+      if (this.selected.length === 0 || this.selected.length > 1) {
+        const message =
+          this.selected.length === 0 ? "请选择一个仓库" : "只能选择一个仓库";
+        this.$message.warning(message);
+        return;
+      }
+
+      const { wsm_code, id } = this.selected[0];
+      this.$emit("selected", { code: wsm_code, id });
+      this._visible = false;
+    },
+    restSearch() {
+      // 表格 - 分页
+      this.pageInfo = {
+        size: 10,
+        curr: 1,
+        total: 0
+      };
+      this.supplierNo = [];
+      this.input = "";
+      this.select = "1";
+      this.parmValue = {
+        supplierNo: "", //供应商编码
+        wsm_code: "", //仓库编码
+        wsm_type: "",
+        start: "", //新建起始时间
+        company_new_name: "", //负责人部门
+        end: "", //新建结束时间
+        mobile: "", //手机号
+        contactor_name: "", //联系人
+        page: 1, // 页码
+        size: 10 // 每页显示条数
+      };
+      this.searchList();
+    },
+    handleSelection(evt) {
+      const { list } = evt;
+      this.selected = list;
+    },
+    async searchList() {
+      if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start == "" && this.parmValue.end != "")
+      ) {
+        this.$message.warning("开始时间和结束时间不能为空");
+        return;
+      }
+      this.loading = true;
+      this.parmValue.wsm_code = this.select === "1" ? this.input : "";
+      this.parmValue.contactor_name = this.select === "2" ? this.input : "";
+      this.parmValue.mobile = this.select === "3" ? this.input : "";
+      this.parmValue.company_new_name = this.select === "4" ? this.input : "";
+
+      const { code, data } = await asyncRequest.stock({
+        ...this.parmValue,
+        needRela: true
+      });
+
+      if (code === 0) {
+        const { list, count } = data ?? {};
+        console.log(list);
+        this.tableData = list;
+        this.pageInfo.total = Number(count ?? "0");
+      } else if (code >= 100 && code <= 104) {
+        await this.logout();
+      } else {
+        this.tableData = [];
+        this.pageInfo.total = 0;
+      }
+      this.loading = false;
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.stock-dialog {
+  /deep/ .el-pagination {
+    float: left !important;
+  }
+}
+</style>

src/views/supplierSellOut/supplierSellOutOrder/index.vue

@@ -28,14 +28,12 @@
               <el-col :span="4" style="width: 405px; display: flex; align-items: center">
                 <el-dropdown>
                   <el-button size="mini" style="margin-right: 10px">
-                    {{ timerMaps[timerKey].label
-                    }}<i class="el-icon-arrow-down el-icon--right"></i>
+                    {{ timerMaps[timerKey].label}}
+                    <i class="el-icon-arrow-down el-icon--right"></i>
                   </el-button>
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item v-for="key in Object.keys(timerMaps)" :key="key">
-                      <p @click="setTimerKey(key)">
-                        {{ timerMaps[key].label }}
-                      </p>
+                      <p @click="setTimerKey(key)">{{ timerMaps[key].label }}</p>
                     </el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
@@ -67,9 +65,7 @@
                   type="primary"
                   style="float: right; margin-left: 5px"
                   @click="searchList"
-                >
-                  刷新
-                </el-button>
+                >刷新</el-button>
               </el-col>
               <el-col
                 :span="4"
@@ -82,14 +78,12 @@
                   @click="download"
                   :size="searchSize"
                   class="fr"
-                >
-                  导出
-                </el-button>
+                >导出</el-button>
               </el-col>
             </el-row>
             <el-row style="padding-top: 10px">
               <el-col :span="4" style="width: 177px">
-                <el-switch 
+                <el-switch
                   v-model="parmValue.use_type"
                   :active-value="usetypeOtions[1].value"
                   :inactive-value="usetypeOtions[0].value"
@@ -159,14 +153,7 @@
               </el-col>
 
               <el-col :span="4" style="width: 66px" class="fr">
-                <el-button
-                  type="warning"
-                  class="fr"
-                  :size="searchSize"
-                  @click="restSearch"
-                >
-                  重置
-                </el-button>
+                <el-button type="warning" class="fr" :size="searchSize" @click="restSearch">重置</el-button>
               </el-col>
             </el-row>
 
@@ -258,8 +245,8 @@
         <template #use_type="{ scope }">
           <el-tag size="mini">
             {{
-              (usetypeOtions.find(({ value }) => value === scope.row.use_type) || {})
-                .label || "---"
+            (usetypeOtions.find(({ value }) => value === scope.row.use_type) || {})
+            .label || "---"
             }}
           </el-tag>
         </template>
@@ -295,7 +282,7 @@
             placement="top"
           >
             <i class="el-icon-share tb-icon" @click="handleShare(scope.row.outCode)"></i>
-          </el-tooltip> -->
+          </el-tooltip>-->
         </template>
       </ex-table>
       <add-edit
@@ -321,37 +308,36 @@ import asyncRequest from "@/apis/service/supplierSellOut/supplierSellOutOrder";
 import addEdit from "./components/addEdit.vue";
 import { columns } from "./columns";
 import { shareWebUrl } from "@/config";
+import companyHelper from "@/mixins/companyHelper";
 import {
   xs_order_source_options,
   xs_order_type_options,
-  usetypeOtions,
+  usetypeOtions
 } from "@/assets/js/statusList";
-import companyHelper from "@/mixins/companyHelper";
 
 export default {
   name: "sellOutOrder",
   mixins: [mixinPage, resToken, companyHelper],
   components: {
-    addEdit,
+    addEdit
   },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size", "isSupertube"]),
     powers() {
+      const { btnList } = this.$store.getters;
       const tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "supplierSellOutOrder"
-        ) || {};
+        btnList.find(item => item.menu_route == "supplierSellOutOrder") || {};
       const { action } = tran ?? {};
       return action ?? [];
     },
     dpowers() {
       const tran =
         this.$store.getters.btnList.find(
-          (item) => item.menu_route == "supplierSellOutOrdeDetail"
+          item => item.menu_route == "supplierSellOutOrdeDetail"
         ) || {};
       const { action } = tran ?? {};
       return action ?? [];
-    },
+    }
   },
   data() {
     return {
@@ -366,13 +352,13 @@ export default {
         add: {
           start: "start",
           end: "end",
-          label: "添加时间",
+          label: "添加时间"
         },
         send: {
           start: "start_sendtime",
           end: "end_sendtime",
-          label: "发货时间",
-        },
+          label: "发货时间"
+        }
       },
       sitem: null,
       // 状态
@@ -407,7 +393,7 @@ export default {
         company_name: "", //申请人部门
         page: 1, // 页码
         size: 15, // 每页显示条数
-        use_type: "1",
+        use_type: "1"
       },
       // 表格 - 数据
       tableData: [],
@@ -415,18 +401,18 @@ export default {
       table: {
         stripe: true,
         border: true,
-        _defaultHeader_: ["setcol"],
+        _defaultHeader_: ["setcol"]
       },
       // 表格 - 分页
       pageInfo: {
         size: 15,
         curr: 1,
-        total: 0,
+        total: 0
       },
       // 表格 - 列参数
       columns,
       xs_order_source_options,
-      xs_order_type_options,
+      xs_order_type_options
     };
   },
   mounted() {
@@ -445,7 +431,7 @@ export default {
       this.pageInfo = {
         size: size,
         curr: page,
-        total: 0,
+        total: 0
       };
       //多选条件
       this.select = this.parmValue.select;
@@ -490,7 +476,7 @@ export default {
     getRouter(toRouter, queryId) {
       if (toRouter && queryId) {
         let model = {
-          id: queryId,
+          id: queryId
           // type: 'view',
         };
 
@@ -501,7 +487,7 @@ export default {
         //
         let routerModel = {
           options: JSON.parse(JSON.stringify(this.parmValue)),
-          router: this.$route.path,
+          router: this.$route.path
         };
         model.preModel = JSON.stringify(routerModel);
 
@@ -524,9 +510,9 @@ export default {
       }
 
       let model = {
-        outCodes: [],
+        outCodes: []
       };
-      this.changeList.forEach((item) => {
+      this.changeList.forEach(item => {
         model.outCodes.push(item.outCode);
       });
 
@@ -543,10 +529,11 @@ export default {
           headers: {
             // 'Content-Type': 'multipart/form-data',
             // Accept: "application/vnd.ms-excel"
-            Accept: httpType,
-          },
+            //
+            Accept: httpType
+          }
         })
-          .then((res) => {
+          .then(res => {
             // console.log(res)
             // console.log(this.fileUrl)
             // return;
@@ -554,7 +541,7 @@ export default {
               let url = window.URL.createObjectURL(
                 new Blob([res.data], {
                   // type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8",
-                  type: httpType,
+                  type: httpType
                 })
               );
               let link = document.createElement("a");
@@ -577,7 +564,7 @@ export default {
               }, 500);
             }
           })
-          .catch((error) => {
+          .catch(error => {
             console.log(error);
             this.loading = false;
           });
@@ -603,13 +590,13 @@ export default {
         company_name: "", //申请人部门
         page: 1, // 页码
         size: 15, // 每页显示条数
-        use_type: "1",
+        use_type: "1"
       };
       // 表格 - 分页
       this.pageInfo = {
         size: 15,
         curr: 1,
-        total: 0,
+        total: 0
       };
       this.searchList();
     },
@@ -624,18 +611,18 @@ export default {
       await this.$confirm("确定要删除？", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning",
+        type: "warning"
       })
         .then(async () => {
           const model = {
             id: id,
-            status: status + "" === "1" ? "0" : "1",
+            status: status + "" === "1" ? "0" : "1"
           };
           const res = await asyncRequest.status(model);
           if (res && res.code === 0) {
             this.$notify.success({
               title: "删除成功",
-              message: "",
+              message: ""
             });
             this.searchList();
           } else if (res && res.code >= 100 && res.code <= 104) {
@@ -661,9 +648,11 @@ export default {
       }
       this.loading = true;
       let model = JSON.parse(JSON.stringify(this.parmValue));
-      model['customerCode'] = Array.isArray(model['customerCode']) ? model['customerCode'][0] : model['customerCode']
-      delete model['customerName']
-      model['noRelation'] = true
+      model["customerCode"] = Array.isArray(model["customerCode"])
+        ? model["customerCode"][0]
+        : model["customerCode"];
+      delete model["customerName"];
+      model["noRelation"] = true;
       model.supplierNo = this.currentCompany;
       // model.noRelation = true
 
@@ -672,7 +661,7 @@ export default {
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
         this.pageInfo.total = Number(res.data.count);
-        this.tableData.forEach((v) => {
+        this.tableData.forEach(v => {
           v.good_class = "";
           if (v.can && v.can.length > 0) {
             v.can.forEach((x, i) => {
@@ -694,20 +683,20 @@ export default {
       await this.$confirm("确定要改为" + str + "?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning",
+        type: "warning"
       })
         .then(async () => {
           this.loading = true;
           const model = {
             id: id,
-            status: status + "" === "1" ? "0" : "1",
+            status: status + "" === "1" ? "0" : "1"
           };
           const res = await asyncRequest.status(model);
           if (res && res.code === 0) {
             this.loading = false;
             this.$notify.success({
               title: "状态修改成功！",
-              message: "",
+              message: ""
             });
             await this.searchList();
           } else if (res && res.code >= 100 && res.code <= 104) {
@@ -756,21 +745,27 @@ export default {
       await this.searchList();
     },
     async handleValue() {
-      this.parmValue.orderCode = this.select === "orderCode" ? this.s_input : "";
+      this.parmValue.orderCode =
+        this.select === "orderCode" ? this.s_input : "";
       this.parmValue.outCode = this.select === "outCode" ? this.s_input : "";
-      this.parmValue.supplier_name = this.select === "supplier_name" ? this.s_input : "";
+      this.parmValue.supplier_name =
+        this.select === "supplier_name" ? this.s_input : "";
 
       // this.parmValue.supplierName =
       //   this.select === "supplierNo" ? this.s_input : "";
-      this.parmValue.good_code = this.select === "good_code" ? this.s_input : "";
-      this.parmValue.good_name = this.select === "good_name" ? this.s_input : "";
-      this.parmValue.apply_name = this.select === "apply_name" ? this.s_input : "";
+      this.parmValue.good_code =
+        this.select === "good_code" ? this.s_input : "";
+      this.parmValue.good_name =
+        this.select === "good_name" ? this.s_input : "";
+      this.parmValue.apply_name =
+        this.select === "apply_name" ? this.s_input : "";
       this.parmValue.cgdNo = this.select === "cgdNo" ? this.s_input : "";
-      this.parmValue.company_name = this.select === "company_name" ? this.s_input : "";
+      this.parmValue.company_name =
+        this.select === "company_name" ? this.s_input : "";
 
       await this.searchList();
-    },
-  },
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>