Merge branch 'sit'

src/assets/js/btnList.js

@@ -87,6 +87,6 @@ const btnList = [
   { code: "086", name: "订单导入" },
   { code: "087", name: "导出" },
   { code: "088", name: "确认收货" },
-
+  { code: "089", name: "批量已与供应商确认" },
 ];
 export default btnList;

src/components/globalComponents/Breadcrumb/main.vue

@@ -29,7 +29,7 @@ export default {
     return {
       levelList: null,
       isShow: false,
-      backOtions: null,
+      backOtions: "",
       backUrl: "",
     };
   },
@@ -68,11 +68,13 @@ export default {
         let model = JSON.parse(preModel);
         this.isShow = true;
         const { options, router } = model;
-        this.backOtions = options;
+        this.backOtions = JSON.stringify(options);
         this.backUrl = router;
       } else {
         this.isShow = false;
+        // this.backOtions = "";
       }
+      console.log("active" + this.backOtions);
     },
     isDashboard(route) {
       const name = route && route.name;
@@ -92,10 +94,11 @@ export default {
       if (!this.isShow) {
         return;
       }
+      console.log("wantto" + this.backOtions);
       window.vm.$router.push({
         path: this.backUrl,
         query: {
-          back: JSON.stringify(this.backOtions),
+          back: this.backOtions,
         },
       });
     },

src/components/globalComponents/show-goods-data-table/main.vue

@@ -341,7 +341,7 @@
           class="fl"
           v-for="(si, sii) in sitem.good_img"
           :key="si + sii"
-          :src="sitem.good_img"
+          :src="si"
           alt=""
         />
       </template>
@@ -419,7 +419,7 @@
           class="fl"
           v-for="(si, sii) in sitem.good_img"
           :key="si + sii"
-          :src="sitem.good_img"
+          :src="si"
           alt=""
         />
       </template>

src/views/process/oing/index.vue

@@ -131,12 +131,18 @@ export default {
     };
   },
   mounted() {
-    console.log(this.process_router_list);
     const { back } = this.$route.query;
     if (back) {
       this.parmValue = JSON.parse(back);
+      const {page,size}=this.parmValue
+       this.pageInfo= {
+        size: size,
+        curr: page,
+        total: 0,
+      }
     }
-    this.searchProList();
+
+    // this.searchProList();
     this.searchList();
   },
   methods: {
@@ -152,6 +158,7 @@ export default {
           id: to === "code" ? order_code : order_id,
         };
 
+        console.log(this.parmValue);
         let routerModel = {
           options: JSON.parse(JSON.stringify(this.parmValue)),
           router: this.$route.fullPath,

src/views/purchaseIn/purchaseOrder/detail.vue

@@ -15,8 +15,6 @@
           :sitem="sitem"
           :showBtn="status === '1' && powers.some((item) => item == '082')"
         />
-
-       
       </div>
       <el-tabs v-model="activeTabs">
         <el-tab-pane label="业务详情" name="1">
@@ -29,7 +27,6 @@
                 :columns="ShowDataTableColumns"
               >
                 <template slot="supplier_name">
-                  
                   <span>{{ sitem.supplier_name }}</span>
                   <el-popover placement="top" width="300" trigger="hover">
                     <ul>
@@ -125,22 +122,18 @@
                   </el-popover>
                 </template>
 
-
-
-
-                <template slot="gold_price" >
-                  <div v-if="sitem.status == '0' && sitem.can[0].id == '6' && cost_detailArr.is_gold_price == '1'">
-                    {{sitem.gold_price}}
-                  </div>
-                  <div v-else>
-                    ----
+                <template slot="gold_price">
+                  <div
+                    v-if="
+                      sitem.status == '0' &&
+                      sitem.can[0].id == '6' &&
+                      cost_detailArr.is_gold_price == '1'
+                    "
+                  >
+                    {{ sitem.gold_price }}
                   </div>
+                  <div v-else>----</div>
                 </template>
-
-
-
-
-
               </show-data-table>
             </el-collapse-item>
             <el-collapse-item title="商品信息" name="2">
@@ -153,52 +146,19 @@
                 :iscgd="true"
               />
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-            
-
-
-
               <editPrice
                 :newTime="newTime"
-                v-if="newTime !== '' && sitem.status == '0' && sitem.can[0].id == '6' && cost_detailArr.is_gold_price == '1'"
-                
+                v-if="
+                  newTime !== '' &&
+                  sitem.status == '0' &&
+                  sitem.can[0].id == '6' &&
+                  cost_detailArr.is_gold_price == '1'
+                "
                 :sitem="sitem"
                 :cost_detailArr="cost_detailArr"
-                @refresh = "refresh"
+                @refresh="refresh"
               >
-
               </editPrice>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
             </el-collapse-item>
             <el-collapse-item
               title="入库单"
@@ -279,7 +239,6 @@ export default {
         return [];
       }
     },
-    
   },
   data() {
     return {
@@ -297,7 +256,7 @@ export default {
       loading: false,
       queryId: "",
       ReturnAddModel: false, //采购单退货弹窗
-      cost_detailArr:[],
+      cost_detailArr: [],
       fileUrl: urlConfig.baseURL,
     };
   },
@@ -306,21 +265,18 @@ export default {
     this.initData();
   },
   methods: {
-    
-    
     // editPriceIf(sitem){
     //   console.log(sitem.status,"aaaaaaaa")
     //     if(sitem.status == "0" ){
-          
+
     //       return false
     //     }else{
     //       return true
     //     }
-      
+
     // },
-    refresh(){
-     
-      this.initData()
+    refresh() {
+      this.initData();
     },
     getNewTime() {
       this.newTime = new Date().valueOf();
@@ -332,16 +288,15 @@ export default {
         await this.setStatus(type, "提交入库方审核", e.remark);
       }
     },
-    async goldPrice(){
-      
+    async goldPrice() {
       // console.log(this.sitem.order_type,"11111111111111111111111")
       // if(this.sitem.order_type){}
       // return;
-      let res = {}
-      let {order_type} = this.sitem
-      if(order_type == "1"||order_type == "2"||order_type == "5"){
+      let res = {};
+      let { order_type } = this.sitem;
+      if (order_type == "1" || order_type == "2" || order_type == "5") {
         res = await asyncRequest.cost_detail({ spuCode: this.sitem.spuCode });
-      }else{
+      } else {
         res = await asyncRequest.cove_detail({ spuCode: this.sitem.spuCode });
       }
       if (res && res.code === 0 && res.data) {
@@ -357,8 +312,8 @@ export default {
       const res = await asyncRequest.detail({ cgdNo: this.queryId });
       if (res && res.code === 0 && res.data) {
         this.sitem = res.data;
-        console.log("11111111111111111",this.sitem)
-        this.goldPrice()
+        console.log("11111111111111111", this.sitem);
+        this.goldPrice();
         const { status, can, cgdNo } = this.sitem;
         this.status = status;
         if (can && can.length > 0) {
@@ -375,7 +330,7 @@ export default {
       }
       this.loading = false;
     },
-    
+
     async statusConfirm() {
       await this.$confirm(`确定已与供应商确认？`, {
         confirmButtonText: "确定",
@@ -384,7 +339,7 @@ export default {
       })
         .then(async () => {
           let model = {
-            cgdNo: this.sitem.cgdNo,
+            cgdNo: [this.sitem.cgdNo],
             status: "1",
           };
           const res = await asyncRequest.status(model);

src/views/purchaseIn/purchaseOrder/index.vue

@@ -49,7 +49,7 @@
                   />
                 </el-select>
               </el-col>
-              <el-col :span="4" style="width: 370px; padding: 0 0 0 10px">
+              <el-col :span="4" style="width: 310px; padding: 0 0 0 10px">
                 <search-supplier
                   :size="searchSize"
                   :value="wsm_supplierNo"
@@ -81,6 +81,24 @@
                   刷新
                 </el-button>
               </el-col>
+               <el-col
+                :span="4"
+                style="width: 150px; float: right"
+                v-if="
+                  powers &&
+                  powers.length > 0 &&
+                  powers.some((item) => item == '089')
+                "
+              >
+                <el-button
+                  type="primary"
+                  @click="statusConfirm"
+                  :size="searchSize"
+                  class="fr"
+                >
+                  批量已与供应商确认
+                </el-button>
+              </el-col>
             </el-row>
             <el-row style="padding: 10px 0 0 0">
               <el-col :span="4" style="width: 120px">
@@ -162,7 +180,9 @@
                 :span="4"
                 style="width: 66px; float: right"
                 v-if="
-                  powers && powers.length > 0 && powers.some((item) => item == '087')
+                  powers &&
+                  powers.length > 0 &&
+                  powers.some((item) => item == '087')
                 "
               >
                 <el-button
@@ -175,7 +195,7 @@
                   导出
                 </el-button>
               </el-col>
-              
+               
             </el-row>
           </div>
         </template>
@@ -396,6 +416,51 @@ export default {
       }
     },
 
+    async statusConfirm() {
+      if (this.changeList.length <= 0) {
+        this.$message.warning("至少选择一条采购单数据！");
+        return;
+      }
+      let isok = true,
+        list = [];
+      this.changeList.forEach((e) => {
+        if (e.status !== "0") {
+          isok = false;
+        }
+        list.push(e.cgdNo)
+      });
+      if(!isok){
+         this.$message.warning("只能选择待与供应商确认的采购单！");
+        return;
+      }
+      await this.$confirm(`确定批量确认？`, {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          let model = {
+            cgdNo: list,
+            status: "1",
+          };
+          const res = await asyncRequest.status(model);
+          this.loading = false;
+          if (res && res.code === 0) {
+            this.$notify.success({
+              title: "提交成功！",
+              message: "",
+            });
+            await this.searchList();
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.$message.warning(res.message);
+          }
+        })
+        .catch(() => {
+          console.log("取消");
+        });
+    },
     restSearch() {
       this.sselect = "创建时间";
       this.select = "1";

src/views/sellOut/zixunOrder/columns.js

@@ -490,6 +490,12 @@ const feedbackListCol = [
     label: "信息有效期",
     "width": "85"
   },
+  // {
+  //   prop: "origin_addr",
+  //   label: "产地",
+  //   "width": "135"
+  // },
+
   {
     prop: "delivery_place_cn",
     label: "发货地",

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

@@ -20,11 +20,11 @@
         status-icon
         :size="'mini'"
         :rules="rulesThis"
-        label-width="75px"
+        label-width="102px"
         class="demo-ruleForm"
       >
         <el-row>
-          <el-col :span="24">
+          <el-col :span="20">
             <el-form-item label="商品名称">
               <el-input
                 v-if="show_sitem"
@@ -34,7 +34,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <!-- <el-col :span="4">
             <el-form-item label="图片" style="margin: 0" label-width="44px">
               <img
                 class="hover"
@@ -45,7 +45,7 @@
                 style="width: 35px; height: 35px"
               />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="4">
             <el-form-item label="单位" label-width="50px">
               <el-input
@@ -57,7 +57,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="7">
+          <el-col :span="12">
             <el-form-item label="当前售价">
               <el-input
                 v-if="show_sitem"
@@ -67,11 +67,10 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="9">
+          <el-col :span="12">
             <el-form-item
               label="期望售价"
               prop="bargain_price"
-              label-width="88px"
             >
               <digital-input
                 :values="ruleForm.bargain_price"
@@ -93,24 +92,9 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item
-              label="议价原因"
-              prop="result_info_id"
-              label-width="88px"
-            >
-              <abnormal-cause
-                :value="ruleForm.result_info_id"
-                :placeholder="'议价原因'"
-                :type="'7'"
-                :disabled="false"
-                :size="'mini'"
-                @searchChange="select_change"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item label="当前工艺费" label-width="108px">
+
+          <el-col :span="12">
+            <el-form-item label="当前工艺费">
               <el-input
                 v-if="show_sitem"
                 v-model="show_sitem.sale_cost_fee"
@@ -119,12 +103,8 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="9">
-            <el-form-item
-              label="期望工艺费"
-              prop="cost_price"
-              label-width="108px"
-            >
+          <el-col :span="12">
+            <el-form-item label="期望工艺费" prop="cost_price">
               <digital-input
                 :values="ruleForm.cost_price"
                 :name="'ruleForm.cost_price'"
@@ -145,8 +125,22 @@
               />
             </el-form-item>
           </el-col>
-
-          <el-col :span="18">
+          <el-col :span="8">
+            <el-form-item
+              label="议价原因"
+              prop="result_info_id"
+            >
+              <abnormal-cause
+                :value="ruleForm.result_info_id"
+                :placeholder="'议价原因'"
+                :type="'7'"
+                :disabled="false"
+                :size="'mini'"
+                @searchChange="select_change"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
             <el-form-item
               label="议价备注:"
               prop="bargain_remark"
@@ -163,7 +157,7 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6" style="text-align: right">
+          <el-col :span="24" style="text-align: right">
             <el-button @click="showModelThis = false" :size="'mini'">{{
               isDetail ? "关 闭" : "取 消"
             }}</el-button>