build:修改规格值筛选、字段调整

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

@@ -38,19 +38,22 @@
             <el-form-item label="规格值" prop="spec_value_id">
               <div
                 v-if="specVlist.length > 0"
-                style="max-height: 600px; overflow-y: scroll"
               >
-                <el-radio-group
+                <el-select
                   v-model="ruleForm.spec_value_id"
+                  placeholder="请选择规格值"
                   @change="spec_value_id_change"
+                  style="width:100%"
+                  filterable
                 >
-                  <el-radio
+                  <el-option
                     v-for="item in specVlist"
                     :key="item.id + item.spec_value"
-                    :label="item.id"
-                    >{{ item.spec_value }}</el-radio
+                    :label="item.spec_value"
+                    :value="item.id"
+                    >{{ item.spec_value }}</el-option
                   >
-                </el-radio-group>
+                </el-select>
               </div>
               <div class="no-data" v-else>暂无规格值,请添加！</div>
             </el-form-item>

src/views/purchaseIn/purchaseOrder/index.vue

@@ -157,6 +157,7 @@
                     <el-option label="商品名称" value="5"></el-option>
                     <el-option label="商品创建人" value="6"></el-option>
                     <el-option label="采购供应商编号" value="7"></el-option>
+                    <el-option label="采购供应商名称" value="10"></el-option>
                     <el-option label="订单编号" value="8"></el-option>
                     <el-option label="商品创建人部门" value="9"></el-option>
                   </el-select>
@@ -655,6 +656,7 @@ export default {
       this.parmValue.supplierNo = this.select === "7" ? this.input : ""; // 采购供应商编号
       this.parmValue.orderCode = this.select === "8" ? this.input : ""; // 采购供应商编号
       this.parmValue.company_name = this.select === "9" ? this.input : ""; // 部门
+      this.parmValue.supplier_name = this.select === "10" ? this.input : ""; // 采购供应商名称
       console.log(this.pageInfo);
       // this.wsm_supplierNo = [];
       const res = await asyncRequest.list(this.parmValue);

src/views/purchaseIn/workbench/components/baseFormAddEdit.vue

@@ -39,19 +39,22 @@
             <el-form-item label="规格值" prop="spec_value_id">
               <div
                 v-if="specVlist.length > 0"
-                style="max-height: 600px; overflow-y: scroll"
               >
-                <el-radio-group
+                <el-select
+                  placeholder="请选择规格值"
                   v-model="ruleForm.spec_value_id"
                   @change="spec_value_id_change"
+                  style="width:100%"
+                  filterable
                 >
-                  <el-radio
+                  <el-option
                     v-for="item in specVlist"
                     :key="item.id + item.spec_value"
-                    :label="item.id"
-                    >{{ item.spec_value }}</el-radio
+                    :label="item.spec_value"
+                    :value="item.id"
+                    >{{ item.spec_value }}</el-option
                   >
-                </el-radio-group>
+                </el-select>
               </div>
               <div class="no-data" v-else>暂无规格值,请添加！</div>
             </el-form-item>

src/views/sellOut/returnOrder/columns.js

@@ -16,11 +16,11 @@ export default [
   //   width: "160"
   // },
  
-  // {
-  //   prop: "orderCode",
-  //   label: "销售订单编号",
-  //   width: "160"
-  // },
+  {
+    prop: "orderCode",
+    label: "销售订单编号",
+    width: "160"
+  },
   {
     prop: "good_code",
     label: "商品属性编号",
@@ -109,4 +109,4 @@ export default [
     _slot_: "operation",
   },
 
-]
+]

src/views/sellOut/sellReturn/columns.js

@@ -25,6 +25,11 @@ export default [
     label: "商品成本编码",
     width: "160"
   },
+  {
+    prop: "skuCode",
+    label: "上线商品编码",
+    width: "160"
+  },
   {
     prop: "good_name",
     label: "商品名称",
@@ -86,4 +91,4 @@ export default [
 // returnCode	是	string	退货单编号
 // good_type_code	是	string	商品属性
 // good_name	是	string	商品名称
-// status	是	string	状态
+// status	是	string	状态

src/views/sellOut/sellReturn/index.vue

@@ -78,7 +78,8 @@
                       <el-option label="销售退货单编号" value="returnCode" />
                       <el-option label="销售订单编号" value="orderCode" />
                       <el-option label="申请人部门" value="company_name" />
-
+                      <el-option label="商品成本编号" value="good_code" />
+                      <el-option label="上线商品编号" value="skuCode" />
                       <el-option label="申请人" value="apply_name" />
                     </el-select>
                     <el-button
@@ -196,6 +197,8 @@ export default {
         returnCode: "", //销售退货code
         orderCode: "", //销售订单code
         company_name: "",
+        good_code:"",
+        skuCode:"",
         apply_name: "", //申请人
         start: "",
         end: "",
@@ -284,7 +287,7 @@ export default {
       this.parmValue = {
         order_type: "",
         company_name: "", //申请人部门
-
+        good_code:"",
         returnCode: "", //销售退货code
         orderCode: "", //销售订单code
         apply_name: "", //申请人
@@ -354,6 +357,10 @@ export default {
         this.select === "apply_name" ? this.s_input : "";
       this.parmValue.company_name =
         this.select === "company_name" ? this.s_input : "";
+      this.parmValue.good_code = this.select === "good_code" ? this.s_input : "";
+
+      this.parmValue.skuCode = this.select === "skuCode" ? this.s_input : "";
+
       let model = JSON.parse(JSON.stringify(this.parmValue));
 
       const res = await asyncRequest.list(model);

src/views/sellOut/zixunOrder/components/baseFormAddEdit.vue

@@ -39,19 +39,22 @@
             <el-form-item label="规格值" prop="spec_value_id">
               <div
                 v-if="specVlist.length > 0"
-                style="max-height: 600px; overflow-y: scroll"
               >
-                <el-radio-group
+                <el-select
                   v-model="ruleForm.spec_value_id"
+                  placeholder="请选择规格值"
                   @change="spec_value_id_change"
+                  style="width:100%"
+                  filterable
                 >
-                  <el-radio
+                  <el-option
                     v-for="item in specVlist"
                     :key="item.id + item.spec_value"
-                    :label="item.id"
-                    >{{ item.spec_value }}</el-radio
+                    :label="item.spec_value"
+                    :value="item.id"
+                    >{{ item.spec_value }}</el-option
                   >
-                </el-radio-group>
+                </el-select>
               </div>
               <div class="no-data" v-else>暂无规格值,请添加！</div>
             </el-form-item>