Merge branch 'sit'

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

@@ -28,4 +28,6 @@ export default {
   aftercancel: (data, params) => http(api + "aftercancel", data, "post", params),
   // 售后单审核状态
   afterstatus: (data, params) => http(api + "afterstatus", data, "post", params),
+  // 确认收货
+  saleoutreceipt: (data, params) => http(api + "saleoutreceipt", data, "post", params),
 };

src/assets/js/btnList.js

@@ -86,6 +86,7 @@ const btnList = [
   { code: "085", name: "批量关联库存" },
   { code: "086", name: "订单导入" },
   { code: "087", name: "导出" },
+  { code: "088", name: "确认收货" },
 
 ];
 export default btnList;

src/components/globalComponents/file-upload/main.vue

@@ -48,9 +48,11 @@ export default {
   },
   methods: {
     async handleChange(event) {
+      // console.log(event)
       let that = this;
       let inputDOM1 = that.$refs.inputer;
       const files = inputDOM1.files;
+      console.log(files)
       let length = files.length;
       if (length === 0) return;
       that.loading = that.$loading({
@@ -65,6 +67,7 @@ export default {
           that.$refs.inputer.value = "";
         } else {
           let str = await that.httpupLoad(files, i);
+          console.log(i,str)
           if (str === "error") {
             that.$emit("UploadErrorEvent");
           } else if (str === "break") {

src/components/globalComponents/show-goods-data-table/ShowDataTableColumns.js

@@ -153,7 +153,13 @@ const coveColumns = [
   },
 
 
-  
+  {
+    prop: "good_img",
+    label: "商品图片",
+    _slot_: "good_img",
+    span: 24,
+
+  }
 
 ]
 const onlineColumns = [

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

@@ -2,7 +2,7 @@
   <div class="showGoodsDataTable" v-loading="loading">
     <show-data-table
       v-if="
-        (type === '1' || type === '2'|| type === '5') &&
+        (type === '1' || type === '2' || type === '5') &&
         this.sitem &&
         this.sitem.addtime &&
         !iscgd
@@ -130,7 +130,7 @@
     </show-data-table>
     <show-data-table
       v-else-if="
-        (type === '1' || type === '2'|| type === '5') &&
+        (type === '1' || type === '2' || type === '5') &&
         this.sitem &&
         this.sitem.addtime &&
         iscgd
@@ -274,14 +274,14 @@
       :border="border"
     >
       <template slot="good_name">
-        <img
+        <!-- <img
           v-viewer
           style="width: 23px; height: 23px; margin: 0 5px 0 0"
           class="fl"
           v-if="sitem.good_img"
           :src="sitem.good_img"
           alt=""
-        />
+        /> -->
         <span>{{ sitem.good_name }}</span>
         <span v-for="(si, i) in sitem.specinfo" :key="si.spec_id + i">
           <span v-if="i !== 0">-</span>
@@ -333,6 +333,17 @@
           }}-{{ sitem.other_config }}</span
         >
         <span v-else>--</span>
+      </template>
+         <template slot="good_img">
+         <img
+          v-viewer
+          style="width: 23px; height: 23px; margin: 0 5px 0 0"
+          class="fl"
+          v-for="(si, sii) in sitem.good_img"
+          :key="si + sii"
+          :src="sitem.good_img"
+          alt=""
+        />
       </template>
     </show-data-table>
     <show-data-table
@@ -347,14 +358,7 @@
       :border="border"
     >
       <template slot="good_name">
-        <img
-          v-viewer
-          style="width: 23px; height: 23px; margin: 0 5px 0 0"
-          class="fl"
-          v-if="sitem.good_img"
-          :src="sitem.good_img"
-          alt=""
-        />
+    
         <span>{{ sitem.good_name }}</span>
         <span v-for="(si, i) in sitem.specinfo" :key="si.spec_id + i">
           <span v-if="i !== 0">-</span>
@@ -370,6 +374,7 @@
           <i class="el-icon-warning-outline fr" slot="reference"></i>
         </el-popover>
       </template>
+
       <template slot="send_way">
         <span>{{ sitem.send_way === "1" ? "供应商包邮" : "公司自提" }}</span>
       </template>
@@ -406,6 +411,17 @@
           }}-{{ sitem.other_config }}</span
         >
         <span v-else>--</span>
+      </template>
+         <template slot="good_img">
+         <img
+          v-viewer
+          style="width: 23px; height: 23px; margin: 0 5px 0 0"
+          class="fl"
+          v-for="(si, sii) in sitem.good_img"
+          :key="si + sii"
+          :src="sitem.good_img"
+          alt=""
+        />
       </template>
     </show-data-table>
     <div v-else>商品编号有误</div>
@@ -498,7 +514,7 @@ export default {
       this.loading = true;
       if (this.type) {
         let res = {};
-        if (this.type === "1" || this.type === "2"|| this.type === "5") {
+        if (this.type === "1" || this.type === "2" || this.type === "5") {
           if (this.iscgd) {
             res = await asyncRequest.cost_detail({
               spuCode: this.spucode,

src/config/env.development.js

@@ -7,10 +7,10 @@ module.exports = {
     // userApi: 'http://www.invoice.com/',
     // baseApi: 'http://www.stock.com/',
 
-    // userApi: 'http://inv.test241.wanyuhengtong.com/',
-    // baseApi: 'http://stock.test241.wanyuhengtong.com/',
-    userApi: 'http://inv.sitw.wanyuhengtong.com/',
-    baseApi: 'http://stock.api.wanyuhengtong.com/',
+    userApi: 'http://inv.test241.wanyuhengtong.com/',
+    baseApi: 'http://stock.test241.wanyuhengtong.com/',
+    // userApi: 'http://inv.sitw.wanyuhengtong.com/',
+    // baseApi: 'http://stock.api.wanyuhengtong.com/',
   },
   webUrl:'http://share.sitw.wanyuhengtong.com/#/test-good-share?id=',
   fileURL: `https://api2.edusit.zretchome.com`,

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

@@ -766,7 +766,7 @@
                   <li
                     class="img-show-li"
                     v-if="
-                      ruleForm.good_img.length < 10 &&
+                      ruleForm.good_img.length < 11 &&
                       (type == 'add' || type === 'editBase' || type === 'edit')
                     "
                   >
@@ -819,7 +819,7 @@
                   <li
                     class="img-show-li"
                     v-if="
-                      ruleForm.good_info_img.length < 10 &&
+                      ruleForm.good_info_img.length < 11 &&
                       (type == 'add' || type === 'editBase' || type === 'edit')
                     "
                   >
@@ -1880,7 +1880,10 @@ export default {
             lead_time: lead_time || "",
             sample_day: sample_day || "",
             good_thumb_img: good_thumb_img || "",
-            good_img: good_img ? (good_img || "").split(",") : [],
+            good_img: good_img ? Object.prototype.toString.call(good_img) ===
+                "[object Array]"
+                  ? []
+                  :(good_img || "").split(",") : [],
             good_info_img: good_info_img
               ? (Object.prototype.toString.call(good_info_img) ===
                 "[object Array]"
@@ -2110,7 +2113,9 @@ export default {
         if (key === "good_thumb_img") {
           this.ruleForm[key] = url;
         } else {
-          this.ruleForm[key].push(url);
+          if(this.ruleForm[key].length<10){
+            this.ruleForm[key].push(url);
+          }
         }
         this.$refs.ruleForm.validateField(key);
         this.$message.success("图片上传成功!");

src/views/goodStore/goodsCost/index.vue

@@ -229,7 +229,9 @@
 
       <template #operation="{ scope }">
         <el-tooltip
-          v-if="powers.some((item) => item == '007')&&(scope.row.status !== '8')"
+          v-if="
+            powers.some((item) => item == '007') && scope.row.status !== '8'
+          "
           effect="dark"
           content="详情"
           placement="top"
@@ -248,9 +250,9 @@
           v-if="
             (powers.some((item) => item == '005') &&
               scope.row.status === '7') ||
-            (powers.some((item) => item == '005') && scope.row.status === '6')||
+            (powers.some((item) => item == '005') &&
+              scope.row.status === '6') ||
             (powers.some((item) => item == '005') && scope.row.status === '8')
-         
           "
           effect="dark"
           content="修改"
@@ -312,7 +314,8 @@
         </el-tooltip>
         <el-tooltip
           v-if="
-            powers.some((item) => item == '010') && scope.row.status !== '7'
+            powers.some((item) => item == '010') &&
+            !(scope.row.status === '7' || scope.row.status === '8')
           "
           effect="dark"
           content="复制商品"
@@ -716,7 +719,7 @@ export default {
         this.$message.warning("至少选择一个商品！");
         return;
       }
-       if (this.changeList.length >100) {
+      if (this.changeList.length > 100) {
         this.$message.warning("商品数量不能超过100！");
         return;
       }

src/views/purchaseIn/recovery/columns.js

@@ -142,45 +142,82 @@ const costColumns = [
     _slot_: "good_name",
     span: 24,
   },
-
+  {
+    prop: "supplierName",
+    label: "供应商名称",
+    _slot_: "supplierName",
+    span: 12,
+  },
+  {
+    prop: "brand_name",
+    label: "品牌",
+    span: 12,
+  },
   {
     prop: "cat",
     label: "分类",
     _slot_: "cat",
-    span: 8,
+    span: 12,
   },
 
   {
-    prop: "brand_name",
-    label: "品牌",
+    prop: "tax",
+    label: "税点",
+    append: '%',
     span: 6,
   },
-
-
   {
     prop: "unit",
     label: "单位",
-    span: 4,
+    span: 6,
   },
   {
-    prop: "send_way",
-    label: "发货方式",
-    _slot_: "send_way",
-    span: 6,
+    prop: "delivery_place_cn",
+    label: "发货地",
+    span: 9,
   },
-
   {
-    prop: "tax",
-    label: "税点",
-    append: '%',
-    span: 4,
+    prop: "expire_day",
+    label: "有效期",
+    append: '天',
+    span: 5,
+  },
+  {
+    prop: "delivery_day",
+    label: "物流时间",
+    append: '天',
+    span: 5,
+  },
+  {
+    prop: "work_day",
+    label: "生产工期",
+    append: '天',
+    span: 5,
+  },
+  {
+    prop: "origin_place_cn",
+    label: "产地",
+    span: 9,
   },
   {
     prop: "pay_way",
     label: "付款方式",
     _slot_: "pay_way",
+    span: 5,
+  },
+  {
+    prop: "creater",
+    label: "反馈人",
     span: 4,
   },
+  {
+    prop: "addtime",
+    label: "反馈时间",
+    span: 6,
+  },
+
+
+ 
 
 
   {
@@ -189,31 +226,115 @@ const costColumns = [
     append: 'g',
     span: 6,
   },
+
   {
-    prop: "creater",
-    label: "反馈人",
-    span: 4,
+    prop: "supply_area",
+    label: "供货区域",
+    _slot_: "supply_area",
+    span: 6,
   },
+ 
+
   {
-    prop: "addtime",
-    label: "反馈时间",
+    prop: "send_way",
+    label: "发货方式",
+    _slot_: "send_way",
     span: 6,
   },
+  {
+    prop: "total_fee",
+    label: "成本合计",
+    append: '元',
+    span: 6,
+  },
+  {
+    prop: "cert_fee",
+    label: "证书费",
+    append: '元',
+    span: 6,
+  },
+  {
+    prop: "pakge_fee",
+    label: "包装费",
+    append: '元',
+    span: 6,
+  },
+
+  {
+    prop: "cost_fee",
+    label: "工艺费",
+    append: '元',
+    span: 6,
+  },
+
+  {
+    prop: "mark_fee",
+    label: "加标费",
+    append: '元',
+    span: 6,
+  },
+
+  {
+    prop: "demo_fee",
+    label: "打样费",
+    append: '元',
+    span: 6,
+  },
+
+  {
+    prop: "open_fee",
+    label: "开模费",
+    append: '元',
+    span: 6,
+  },
+
+  {
+    prop: "delivery_fee",
+    label: "物流费",
+    append: '元',
+    span: 6,
+  },
+  {
+    prop: "nake_fee",
+    label: "裸价",
+    append: '元',
+    span: 6,
+  },
+
+
+
+
+
+
+
   {
     prop: "noble",
     _slot_: "noble",
     label: "贵金属信息",
     span: 24,
   },
+
+  {
+    prop: "remark",
+    label: "采返备注",
+    span: 24,
+  },
   {
-    prop: "craft_desc",
+    prop: "cost_desc",
     label: "工艺说明",
     span: 24,
   },
   {
-    prop: "remark",
-    label: "采返备注",
+    prop: "good_img",
+    _slot_: "good_img",
+    label: "商品图片",
     span: 24,
   },
+
+
+
+
+
 ]
+
 export { columns, statusOptions, order_type_options, options1, options2, options3, options4, options5, options6, options7, options8, options9, costColumns }

src/views/purchaseIn/recovery/index.vue

@@ -82,17 +82,17 @@
           </div>
         </template>
         <template #good_name="{ scope }">
-          <img
+          <!-- <img
             style="width: 20px; height: 20px"
             class="hover fl"
             v-viewer
             :src="scope.row.good_img"
             alt=""
             v-if="scope.row.good_img"
-          />
+          /> -->
           <span>{{ scope.row.good_name }}</span>
           <span v-for="(si, i) in scope.row.specinfo" :key="si.spec_id + i">
-            {{ i === 0 ? "__" : "--" }}{{ si.spec_name }}[{{ si.spec_value }}]
+            {{ i === 0 ? "__" : "--" }}{{ si.spec_name }}[{{ si.spec_value_name }}]
           </span>
         </template>
         <template #can="{ scope }">

src/views/purchaseIn/recovery/showData.vue

@@ -20,15 +20,19 @@
       :columns="costColumns"
       :border="true"
     >
+      <template slot="supplierName">
+        <span>{{ sitem.supplierName }}</span>
+
+        <el-popover placement="top" width="300" trigger="hover">
+          <ul>
+            <li>
+              <span>供应商编号：</span><span>{{ sitem.supplierNo }}</span>
+            </li>
+          </ul>
+          <i class="el-icon-warning-outline fr" slot="reference"></i>
+        </el-popover>
+      </template>
       <template slot="good_name">
-        <img
-          v-viewer
-          style="width: 23px; height: 23px; margin: 0 5px 0 0"
-          class="fl"
-          v-if="sitem.good_img"
-          :src="sitem.good_img"
-          alt=""
-        />
         <span>{{ sitem.good_name }}</span>
         <span v-for="(si, i) in sitem.specinfo" :key="si.spec_id + i">
           <span v-if="i !== 0">-</span>
@@ -74,6 +78,16 @@
           "
         />
       </template>
+      <template slot="supply_area">
+        <el-tag
+          :size="'mini'"
+          v-text="
+            (options6.find((item) => item.id == sitem.supply_area) || {})
+              .name || '--'
+          "
+        />
+      </template>
+
       <template slot="noble">
         <span v-if="sitem.noble_name"
           >{{ sitem.noble_weight ? sitem.noble_weight : "0" }}g-{{
@@ -86,6 +100,17 @@
         >
         <span v-else>--</span>
       </template>
+      <template slot="good_img">
+        <img
+          v-viewer
+          style="width: 23px; height: 23px; margin: 0 5px 0 0"
+          class="fl"
+          v-for="(si, sii) in sitem.good_img"
+          :key="si + sii"
+          :src="si"
+          alt=""
+        />
+      </template>
     </show-data-table>
   </el-dialog>
 </template>
@@ -149,6 +174,13 @@ export default {
       });
       if (code === 0) {
         this.sitem = data;
+        // const { good_img } = this.sitem;
+        // if (good_img) {
+        //   this.sitem.good_img = good_img.split(",");
+        // } else {
+        //   this.sitem.good_img = [];
+        // }
+
         this.loading = false;
       } else if (code >= 100 && code <= 104) {
         await this.logout();

src/views/purchaseIn/workbench/columns.js

@@ -247,6 +247,15 @@ const rules = {
       trigger: "change",
     },
   ],
+
+  delivery_place: [
+    {
+      type: "array",
+      required: true,
+      message: "请选择发货地",
+      trigger: "change",
+    },
+  ],
   //固定成本
   cert_fee: [
     {

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

@@ -8,6 +8,7 @@
     v-loading="loading"
     label-width="85px"
     class="demo-ruleForm"
+    
   >
     <el-row>
       <el-col
@@ -185,6 +186,17 @@
                 @selectChange="selectAreaorigin_place"
               />
             </el-form-item>
+
+            <el-form-item label="发货地" prop="delivery_place">
+              <select-area
+                :placeholder="'发货地'"
+                :value="ruleForm.delivery_place"
+                :size="'mini'"
+                :disabled="type === 'view'"
+                :is-detail="id !== 'add'"
+                @selectChange="selectAreadelivery_place"
+              />
+            </el-form-item>
           </el-col>
           <el-col :span="12" style="padding: 0 0 0 15px">
             <el-table
@@ -192,7 +204,7 @@
               :size="'mini'"
               border
               style="width: 100%"
-              max-height="120px"
+              max-height="175px"
             >
               <el-table-column prop="spec_name" label="规格类型" />
               <el-table-column prop="spec_value_name" label="规格值" />
@@ -559,7 +571,7 @@
         </el-col>
       </el-col>
 
-      <el-col :span="18">
+      <el-col :span="24">
         <el-form-item label="采购备注" prop="remark">
           <el-input
             placeholder="采购备注"
@@ -579,7 +591,7 @@
           </el-input>
         </el-form-item>
       </el-col>
-      <el-col :span="6">
+      <!-- <el-col :span="24">
         <el-form-item
           label="商品图片(<1mb)"
           prop="good_img"
@@ -603,6 +615,61 @@
             ></file-upload>
           </div>
         </el-form-item>
+      </el-col> -->
+
+      <el-col :span="24">
+        <el-form-item
+          label="商品图片(<1mb)"
+          prop="good_img"
+          v-if="ruleForm.good_img"
+          class="activity-upload"
+        >
+          <div class="btnupload" style="position: relative; margin-left:10px;" v-for="(item,index) in ruleForm.good_img" :key=index>
+            <img
+
+              :src="ruleForm.good_img[index]"
+              class="avatar"
+            />
+            <i
+                        v-if="
+                          type == 'add' ||
+                          type === 'editBase' ||
+                          type === 'edit'
+                        "
+                        class="el-icon-close"
+                        @click="closeImg(index, 'good_img')"
+                      ></i>
+            
+          </div>
+          <div v-if="type == 'view' ? false : true">
+             <i  class="el-icon-plus avatar-uploader-icon" style="position: relative; width:50px;height:50px;">
+              <file-upload
+                class="Upload"
+                :accept="'.jpg,.png,.jpeg'"
+                :multiple="true"
+                :disabled="type === 'view'"
+                :uploadcondition="beforeAvatarUpload"
+                @UploadErrorEvent="UploadErrorEventgood_img"
+                @UploadSuccessEvent="UploadSuccessEventgood_img"
+              ></file-upload>
+            </i>
+          </div>
+         
+           
+          
+        </el-form-item>
+        <!-- <i class="el-icon-plus avatar-uploader-icon">
+          
+        </i>
+            <file-upload
+              class="Upload"
+              :accept="'.jpg,.png,.jpeg'"
+              :multiple="true"
+              :disabled="false"
+              :uploadcondition="beforeAvatarUpload"
+              @UploadErrorEvent="UploadErrorEventgood_img"
+              @UploadSuccessEvent="UploadSuccessEventgood_img"
+            ></file-upload> -->
       </el-col>
     </el-row>
   </el-form>
@@ -706,6 +773,11 @@ export default {
     // this.computedCost();
   },
   methods: {
+    //图片悬浮删除
+    closeImg(index, key) {
+      this.ruleForm[key].splice(index, 1);
+      this.$refs.ruleForm.validateField(key);
+    },
     //加法精度问题
     accAdd(arg1, arg2) {
       var r1, r2, m;
@@ -911,6 +983,7 @@ export default {
           weight, //	string	重量
           supply_area, //	string	供货区域 1 全国2 除偏远地区
           origin_place, //	string	产地
+          delivery_place, // string 发货地
           delivery_day, //	string	物流天数
           expire_day, //	string	信息有效期
           good_img, //
@@ -967,6 +1040,9 @@ export default {
           tax: tax ? tax + "%" : "",
           supply_area: supply_area || "",
           origin_place: origin_place ? origin_place.split(",") : [],
+          delivery_place: delivery_place ? delivery_place.split(",") : [],
+
+          
           cert_fee: cert_fee || "0.00",
           pakge_fee: pakge_fee || "0.00",
           cost_fee: cost_fee || "0.00",
@@ -986,7 +1062,7 @@ export default {
           other_config: other_config || "",
           remark: remark || "",
           cost_desc: cost_desc || "",
-          good_img: good_img || "",
+          good_img: good_img || [],
         };
 
         this.status = status;
@@ -1002,6 +1078,10 @@ export default {
       }
     },
     async submitForm() {
+      if(this.ruleForm.good_img.length>10){
+        this.$message.warning("上传图片不能超过10张")
+        return;
+      }
       await this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
           this.loading = true;
@@ -1015,6 +1095,9 @@ export default {
           model.brandid = model.brandid.toString();
           model.supplierNo = model.supplierNo.toString();
           model.origin_place = model.origin_place.toString();
+          model.delivery_place = model.delivery_place.toString();
+
+          
           model.unit_id = model.unit_id.toString();
           model.config = model.config.toString();
           model.tax = parseInt(model.tax + "") + "";
@@ -1073,6 +1156,7 @@ export default {
           this.brand_name = "";
           // this.type === "add" ? this.askItem.brand : "";
           this.unit_name = "";
+          let good_img = this.askItem.good_img ? this.askItem.good_img.split(",") : []
           //this.type === "add" ? this.askItem.unit_name : "";
           this.ruleForm = {
             infoNo: this.id || "",
@@ -1092,6 +1176,7 @@ export default {
             tax: "",
             supply_area: "",
             origin_place: [],
+            delivery_place:[],
             cert_fee: "0.00",
             pakge_fee: "0.00",
             cost_fee: "0.00",
@@ -1117,8 +1202,9 @@ export default {
             other_config: this.type === "add" ? this.askItem.other_config : "",
             remark: "",
             cost_desc: this.type === "add" ? this.askItem.cost_desc : "",
-            good_img: this.type === "add" ? this.askItem.good_img : "",
+            good_img: this.type === "add" ? good_img : [],
           };
+
           if (this.type === "add") {
             this.spec_tableData = JSON.parse(
               JSON.stringify(this.askItem.specinfo)
@@ -1262,6 +1348,13 @@ export default {
       this.ruleForm.origin_place = e;
       this.$refs.ruleForm.validateField("origin_place");
     },
+    //发货地省市区
+    selectAreadelivery_place(e) {
+      this.ruleForm.delivery_place = e;
+      this.$refs.ruleForm.validateField("delivery_place");
+    },
+
+    
 
     //图片上传成功
     async UploadSuccessEventgood_img(data) {
@@ -1270,17 +1363,22 @@ export default {
 
     //图片上传成功
     async UploadSuccessEvent(type, data) {
+      if(this.ruleForm.good_img.length>10){
+        this.$message.warning("上传图片最多不能超过10张")
+        return;
+      }
       const { url } = data;
       if (url === "noToken") {
         await this.logout();
       } else {
         if (type === 1) {
-          this.ruleForm.good_img = url;
+          this.ruleForm.good_img.push(url);
           this.$refs.ruleForm.validateField("good_img");
         } else if (type === 2) {
-          this.ruleForm.good_img = url;
+          this.ruleForm.good_img.push(url);
           this.$refs.ruleForm.validateField("good_img");
         }
+        console.log(this.ruleForm.good_img.length)
         this.$message.success("图片上传成功!");
       }
     },
@@ -1339,6 +1437,7 @@ export default {
         tax: "",
         supply_area: "",
         origin_place: [],
+        delivery_place:[],
         cert_fee: "0.00",
         pakge_fee: "0.00",
         cost_fee: "0.00",
@@ -1357,7 +1456,7 @@ export default {
         other_config: "",
         remark: "",
         cost_desc: "",
-        good_img: "",
+        good_img: [],
       };
     },
     addFormData() {
@@ -1383,6 +1482,7 @@ export default {
         tax: "",
         supply_area: "",
         origin_place: [],
+        delivery_place:[],
         cert_fee: "0.00",
         pakge_fee: "0.00",
         cost_fee: "0.00",
@@ -1401,7 +1501,7 @@ export default {
         other_config: "",
         remark: "",
         cost_desc: "",
-        good_img: "",
+        good_img: [],
       };
     },
   },
@@ -1422,5 +1522,22 @@ export default {
     }
   }
 }
+i.el-icon-close {
+            position: absolute;
+            z-index: 2;
+            top: 0;
+            right: 0;
+            color: #63cbe7;
+            font-weight: bold;
+            cursor: pointer;
+          }
+
+// /deep/ .fileUp {
+//       opacity: 10 !important;
+//     width: 228px !important;
+//     height: 200px !important;
+//     outline: none;
+//     position: static !important;
+// }
 </style>
    

src/views/purchaseIn/workbench/components/baseForm.vue.rej

@@ -0,0 +1,49 @@
+diff a/src/views/purchaseIn/workbench/components/baseForm.vue b/src/views/purchaseIn/workbench/components/baseForm.vue	(rejected hunks)
+@@ -14,26 +14,28 @@
+         :span="24"
+         style="padding: 12px 16px 12px 16px; text-align: right"
+       >
+-        <!-- $total_fee(成本合计初始价格) =打样费/购买数量 + 开模费/购买数量 + 金属重量* 最新金价 + 工艺费* 金属重量+包装费+加标费+证书费+产品裸价0+运费; -->
+-        <!-- ps:没有其他费用-->
+-        <!-- （ruleForm.noble_weight*newGoldPrice)+ （ruleForm.cost_fee*ruleForm.noble_weight）
++      <!-- 贵金属重量*供应商采购金价 + 工艺费*贵金属重量+加标费+包装费+证书费+成本裸价+运费+其他费用=成本合计 -->
++      <!-- 贵金属重量*供应商采购金价 + 工艺费*贵金属重量+加标费+包装费+证书费+成本裸价+运费=成本合计 -->
++      <!-- ps:没有其他费用-->  
++      <!-- （ruleForm.noble_weight*newGoldPrice)+ （ruleForm.cost_fee*ruleForm.noble_weight）
+       + ruleForm.mark_fee + ruleForm.pakge_fee + ruleForm.cert_fee + ruleForm.nake_fee + ruleForm.delivery_fee-->
+-        <!-- 乘法精度函数调用在mounted（初始调用），number_change函数（改变调用），如果放在dom层初始值时undifind会报错  r1,r2-->
+-        <span>
+-          <!-- {{
+-          (ruleForm.demo_fee/askItem.num)+
+-          (ruleForm.open_fee/askItem.num)+
+-          (ruleForm.noble_weight*newGoldPrice)+
+-          (ruleForm.cost_fee*ruleForm.noble_weight)+
+-          ruleForm.pakge_fee+
+-          ruleForm.mark_fee+
+-          ruleForm.cert_fee+ruleForm.nake_fee+ruleForm.delivery_fee 
+-
+-          }} -->
+-          预计成本合计：<span>
+-            
+-            {{newPrice}}
+-          </span></span
++      <!-- 乘法精度函数调用在mounted（初始调用），number_change函数（改变调用），如果放在dom层初始值时undifind会报错  r1,r2-->
++        <span
++          > 成本合计：<span>
++           
++            {{ 
++              accAdd(
++                r1,
++                r2,
++                ruleForm.mark_fee,
++                ruleForm.pakge_fee,
++                ruleForm.cert_fee,
++                ruleForm.nake_fee,
++                ruleForm.delivery_fee,
++                )
++            }}
++           <!-- {{ruleForm.delivery_fee}} -->
++            </span></span
+         >
+         <span
+           class="fl"

src/views/purchaseIn/workbench/detail.vue

@@ -142,7 +142,7 @@
             :size="'mini'"
             style="width: 100%"
           >
-            <el-table-column
+            <!-- <el-table-column
               prop="good_img"
               label="图片"
               width="48"
@@ -162,7 +162,7 @@
                   />
                 </div>
               </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column
               prop="good_name"
               label="商品名称"

src/views/reportQuery/purchaseReport/components/table5.vue.rej

@@ -0,0 +1,16 @@
+diff a/src/views/reportQuery/purchaseReport/components/table5.vue b/src/views/reportQuery/purchaseReport/components/table5.vue	(rejected hunks)
+@@ -177,12 +177,10 @@
+     //重置
+     restSearch() {
+       this.parmValue = {
+-        zxNo:"", //咨询订单号
+-        start_date: "", //起始时间
+-        end_date: "", // 结束时间
++        start_date: "", //新建起始时间
++        end_date: "", // 新建结束时间
+         page: 1, // 页码
+         size: 15, // 每页显示条数
+-        is_export:0//是否导出
+       };
+       // 表格 - 分页
+       this.pageInfo = {

src/views/sellOut/project/components/backGoodShow.vue

@@ -94,7 +94,7 @@
           >
             <template #good_img="{ scope }">
               <div
-                v-if="scope.row.good_img"
+                v-if="scope.row.good_img&&scope.row.data_source === '1'"
                 style="width: 20px; height: 20px"
                 class="hover"
                 v-viewer

src/views/sellOut/sellOutOrder/columns.js

@@ -185,13 +185,13 @@ const showColumns = [
   {
     prop: "sale_price",
     label: "商品单价",
-    _slot_:"sale_price",
+    _slot_: "sale_price",
     span: 6
   },
   {
     prop: "total_price",
     label: "发货申请单总价",
-    _slot_:"total_price",
+    _slot_: "total_price",
     span: 6
   },
   {
@@ -221,10 +221,11 @@ const showColumns = [
     span: 12
   },
 
-  // {
-  //   prop: "good_price",
-  //   label: "商品单价",
-  // },
+  {
+    prop: "remark",
+    label: "发货申请备注",
+    span: 24
+  },
 
 
 ]

src/views/sellOut/sellOutOrder/components/want-deliver.vue

@@ -53,7 +53,17 @@
             v-model="ruleForm.post_code"
             maxlength="100"
           />
-        </el-form-item>
+        </el-form-item> 
+      </el-col>
+      <el-col :span="16">
+          <el-form-item label="备注" prop="remark">
+          <el-input
+            type="textarea"
+            placeholder="备注"
+            v-model="ruleForm.remark"
+            maxlength="100"
+          />
+        </el-form-item> 
       </el-col>
 
       <el-col :span="8" style="text-align: right">
@@ -101,6 +111,7 @@ export default {
         post_name: [],
         post_code: "",
         post_fee: "",
+        remark:"",
         // sendtime: "",
       },
       rules: {
@@ -120,6 +131,11 @@ export default {
           validator: validate_num,
           trigger: "blur",
         },
+        remark:{
+          required: true,
+          validator: validate_num,
+          trigger: "blur",
+        }
       },
     };
   },
@@ -147,7 +163,7 @@ export default {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
 
-          const { outCode, send_num, post_code, post_name, post_fee } =
+          const { outCode, send_num, post_code, post_name, post_fee ,remark} =
             this.sitem;
           this.ruleForm = {
             outCode: outCode || "",
@@ -155,6 +171,7 @@ export default {
             post_name: post_name ? [post_name] : [],
             post_code: post_code || "",
             post_fee: post_fee || "",
+            remark:remark || "",
             // sendtime: "",
           };
         }

src/views/sellOut/sellOutOrder/detail.vue

@@ -5,14 +5,16 @@
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
       <div
-        v-if="status === '2' && powers.some((item) => item == '049')"
         class="detail-page-title"
       >
         <span>发货申请单编号：</span
         ><span v-if="sitem">{{ sitem.outCode }}</span>
         <el-button
           class="fr"
-          v-if="status === '2' && powers.some((item) => item == '049')"
+          v-if="
+            (status === '2' || status === '3') &&
+            powers.some((item) => item == '049')
+          "
           type="primary"
           plain
           :size="'mini'"
@@ -20,6 +22,16 @@
           @click="wellReturnCode"
           >新建售后申请单
         </el-button>
+        <el-button
+          class="fr"
+          v-if="status === '2' && powers.some((item) => item == '088')"
+          type="primary"
+          plain
+          :size="'mini'"
+          style="margin: 0 0 0 10px"
+          @click="wentReceive"
+          >确认收货
+        </el-button>
       </div>
       <!-- 
       <status-bar
@@ -102,16 +114,16 @@
               title="售后申请单结果"
               name="4"
               v-if="
-                status === '2' &&
                 returnCode &&
                 returnCode_type &&
                 sitem &&
-                sitem.order_return&&resitem
+                sitem.order_return &&
+                resitem
               "
             >
               <show-data-table
                 :newTime="newTime"
-                v-if="newTime !== ''&&resitem"
+                v-if="newTime !== '' && resitem"
                 :sitem="resitem"
                 :border="
                   !(
@@ -440,7 +452,7 @@ export default {
           label: "供应商承担",
         },
       ],
-      queryId:"",
+      queryId: "",
       did: "", //详情页上的id
     };
   },
@@ -473,6 +485,33 @@ export default {
         this.$message.warning(res.message);
       }
     },
+    async wentReceive() {
+      await this.$confirm("确定要确认收货？", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          const model = {
+            outCode: this.sitem.outCode,
+          };
+          const res = await asyncRequest.saleoutreceipt(model);
+          if (res && res.code === 0) {
+            this.$notify.success({
+              title: "确认收货",
+              message: "",
+            });
+            await this.initData();
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.$message.warning(res.message);
+          }
+        })
+        .catch(() => {
+          console.log("取消");
+        });
+    },
     async initData(e) {
       this.returnCode = "";
       this.returnCode_type = "";

src/views/sellOut/zixunOrder/columns.js

@@ -461,12 +461,12 @@ const feedbackListCol = [
     "width": "110"
   },
 
-  {
-    prop: "good_img",
-    label: "图片",
-    _slot_: "good_img",
-    "width": "50"
-  },
+  // {
+  //   prop: "good_img",
+  //   label: "图片",
+  //   _slot_: "good_img",
+  //   "width": "50"
+  // },
   {
     prop: "good_name",
     label: "商品名称",
@@ -490,6 +490,11 @@ const feedbackListCol = [
     label: "信息有效期",
     "width": "85"
   },
+  {
+    prop: "delivery_place_cn",
+    label: "发货地",
+    "width": "135"
+  },
   {
     prop: "delivery_day",
     label: "物流时间",

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

@@ -20,7 +20,7 @@
         searchList();
       "
     >
-      <template #good_img="{ scope }">
+      <!-- <template #good_img="{ scope }">
         <div
           v-if="scope.row.good_img"
           style="width: 20px; height: 20px"
@@ -33,7 +33,7 @@
             alt=""
           />
         </div>
-      </template>
+      </template> -->
       <template #status="{ scope }">
         <el-tag
           :size="tablebtnSize"

src/views/stock/stockCount/components/productWeido/index.vue

@@ -25,9 +25,9 @@
       >
         <template #table-header="{}">
           <div style="width: 100%">
-            <el-row style="padding: 0 0 0 80px">
+            <el-row style="padding: 0 0 0 80px" gutter="10">
               <el-col :span="24">
-                <el-col :span="10">
+                <el-col :span="7">
                   <el-input
                     v-model="parmValue.type_code"
                     :size="searchSize"
@@ -35,7 +35,14 @@
                     placeholder="sku编码"
                   />
                 </el-col>
-
+                <el-col :span="7">
+                  <el-input
+                    v-model="parmValue.good_name"
+                    :size="searchSize"
+                    maxlength="40"
+                    placeholder="商品名称"
+                  />
+                </el-col>
                 <!-- 搜索 -->
                 <el-col :span="4" style="width: 54px">
                   <el-button
@@ -199,6 +206,7 @@ export default {
       //入参参数
       parmValue: {
         type_code: "", //商品属性编码
+        good_name:"", //商品名称
         page: 1, // 页码
         size: 15, // 每页显示条数
       },
@@ -234,6 +242,7 @@ export default {
       };
       this.parmValue = {
         type_code: "",
+        good_name:"", //商品名称
         size: 15,
         curr: 1,
       };