bug修改

src/apis/service/goodStore/goodsRepertory/index.js

@@ -3,7 +3,7 @@ import http from "@/apis/axios";
 const api = "admin/";
 export default {
   //价格区间筛选列表
-  listbyladder: (data, params) => http(api + "goodlistbyladder", data, "post", params),
+  getgoodlistbyladder: (data, params) => http(api + "getgoodlistbyladder", data, "post", params),
   // 分页查询
   list: (data, params) => http(api + "goodlist", data, "post", params),
   // 添加

src/views/goodStore/goodsRepertory/columns.js

@@ -46,6 +46,12 @@ const options8 = [
   { id: "7", name: "审核失败" },
   { id: "8", name: "已下线" },
 ]
+
+//是否库存品
+const options9 = [
+  { id: "0", name: "否" },
+  { id: "1", name: "是" },
+]
 const listCol = [
   {
     prop: "skuCode",
@@ -170,4 +176,4 @@ const rules = {
 
 }
 
-export { options1, options2, options3, options4, options5, options6, options7, options8, listCol, rules }
+export { options1, options2, options3, options4, options5, options6, options7, options8, options9, listCol, rules }

src/views/goodStore/goodsRepertory/index.vue

@@ -67,7 +67,41 @@
                 :placeholder="'分类'"
               />
             </el-col>
-
+            <el-col  style="width: 130px; margin-left: 10px">
+              <el-select
+                v-model="parmValue.is_stock"
+                filterable
+                clearable
+                :size="searchSize"
+                placeholder="是否库存品"
+                style="width: 100%"
+                @change="goodsSelect()"
+              >
+                <el-option
+                  v-for="item in options1"
+                  :key="'good_type' + item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-col>
+            <el-col
+              style="width: 120px; margin-left: 10px;"
+            >
+                  <digital-input
+                    :values="parmValue.moq"
+                    :placeholder="'库存数量'"
+                    :min="0"
+                    :max="100000000000"
+                    :position="'right'"
+                    :precision="0"
+                    :controls="false"
+                    :append="''" 
+                    
+                    @reschange="reschange"                
+                  />
+  
+            </el-col>
             <el-col
               :span="3"
               class="fr"
@@ -155,6 +189,17 @@
                   <el-option label="创建人" value="7" /> </el-select
               ></el-input>
             </el-col>
+            <el-col :span="6" style="width: 273px; padding: 0 0 0 10px">
+                <number-range
+                  :lower="parmValue.min_price"
+                  :online="parmValue.max_price"
+                  :title="'价格'"
+                  :width="'120px'"
+                  :size="searchSize"
+                  @numReturned="numReturned"
+                />
+              </el-col>
+
             <el-col
               :span="3"
               class="fr"
@@ -223,7 +268,7 @@
         >
           <i class="el-icon-view tb-icon" @click="openDilog(scope.row)"></i>
         </el-tooltip>
-        <el-tooltip
+        <!-- <el-tooltip
           v-if="
             powers.some((item) => item == '078') &&
             (scope.row.status === '7' || scope.row.status === '8')
@@ -236,7 +281,7 @@
             class="el-icon-upload tb-icon"
             @click="get_againonline(scope.row.skuCode)"
           ></i>
-        </el-tooltip>
+        </el-tooltip> -->
       </template>
     </ex-table>
     <no-auth v-else></no-auth>
@@ -260,6 +305,15 @@
       >
       </show-goods-data-table>
     </el-dialog>
+    <!-- <show-goods-data-table-modal
+      @cancel="visible = false"
+      :showModel="visible"
+      :type="row.type"
+      :title="row.title"
+      :skuCode="row.skuCode"
+      :spuCode="row.spuCode"
+      :iscgd="row.iscgd"
+    /> -->
   </div>
 </template>
 <script>
@@ -288,7 +342,11 @@ export default {
   },
   data() {
     return {
-      row: {},
+      row: {
+        title:"详细信息",
+        type:"1",
+        iscgd:false
+      },
       visible: false,
       options1: options1,
       options8: options8,
@@ -301,6 +359,9 @@ export default {
         end: "", //结束日期
         platform_code: "", //平台编码
         is_stock: "", //是否库存品
+        min_price:"", //价格区间最小值
+        max_price:"", //价格区间最大值
+        moq:0,//库存数量
         page: 1, // 页码
         size: 15, // 每页显示条数
         supplierNo: "", //供应商编号
@@ -344,7 +405,6 @@ export default {
     openDilog(row) {
       this.visible = true;
       this.row = row;
-      console.log(this.row);
     },
 
     restSearch() {
@@ -364,6 +424,9 @@ export default {
         end: "", //结束日期
         platform_code: "", //平台编码
         is_stock: "", //是否库存品
+        min_price:"", //价格区间最小值
+        max_price:"", //价格区间最大值
+        moq:0,//库存数量
         page: 1, // 页码
         size: 15, // 每页显示条数
         supplierNo: "", //供应商编号
@@ -583,6 +646,46 @@ export default {
       this.parmValue.page = 1;
       await this.searchList();
     },
+    //是否库存品
+    async goodsSelect(){
+
+      
+    },
+    //库存数量变动请求
+    async reschange(msg){
+      this.parmValue.moq = msg;
+      await this.goodsSearch()
+    },
+    //价格区间变动触发请求
+    async numReturned(msg){
+      this.parmValue.min_price = msg.lower;
+      this.parmValue.max_price = msg.online;
+      await this.goodsSearch()
+    },
+    //变动查询
+    async goodsSearch(){
+      let obj = this.parmValue;
+      const model = {
+            is_stock: obj.is_stock,
+            min_price: obj.min_price,
+            max_price: obj.max_price,
+            moq: obj.moq,
+            page: obj.page,
+            size: obj.size,
+            
+          };
+      const res = await asyncRequest.getgoodlistbyladder(model);
+          if (res && res.code === 0) {
+            this.loading = false;
+            await this.searchList();
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.loading = false;
+            this.$message.warning(res.message);
+          }
+          console.log(res)
+    },
   },
 };
 </script>
@@ -591,5 +694,9 @@ export default {
 /deep/ .el-dialog {
   width: 1024px;
 }
+/deep/ .el-input__inner{
+  height: 30px ;
+  line-height: 30px;
+}
 </style>
 

src/views/sellOut/salesOrder/components/ShowDataTableColumns.js

@@ -54,6 +54,21 @@ const addColumns = [
     _slot_: "weight",
     span: 24,
   },
+  {
+    prop: "lead_time",
+    label: "工期",
+    span: 8,
+  },
+  {
+    prop: "delivery_day",
+    label: "物流",
+    span: 8,
+  },
+  {
+    prop: "purchase",
+    label: "采购人员",
+    span: 8,
+  },
   {
     prop: "after_sales",
     label: "售后说明",

src/views/sellOut/salesOrder/components/addForm.vue

@@ -1027,6 +1027,7 @@ export default {
       });
       if (code === 0) {
         this.goods_sitem = data;
+        console.log("1111111111111111",this.goods_sitem)
         this.goods_sitem.good_info_img =
           this.goods_sitem.good_info_img.split(",");
         const { weight } = this.goods_sitem;

src/views/sellOut/zixunOrder/components/ShowDataTableColumns.js

@@ -48,6 +48,41 @@ const ShowDataTableColumns = [
     label: "规格",
     _slot_: "specinfo",
   },
+  //需要修改字段
+  {
+    prop: "can_name",
+    label: "PO",
+  },
+   //需要修改字段
+   {
+    prop: "can_name",
+    label: "业管",
+  },
+   //需要修改字段
+   {
+    prop: "can_name",
+    label: "备注",
+  },
+   //需要修改字段
+   {
+    prop: "can_name",
+    label: "工期",
+  },
+   //需要修改字段
+   {
+    prop: "can_name",
+    label: "物流",
+  },
+   //需要修改字段
+   {
+    prop: "can_name",
+    label: "发货地",
+  },
+   //需要修改字段
+   {
+    prop: "can_name",
+    label: "采购人员",
+  },
   {
     prop: "can_name",
     label: "分类",