1

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/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/sellOut/sellOutOrder/detail.vue

@@ -20,6 +20,16 @@
           @click="wellReturnCode"
           >新建售后申请单
         </el-button>
+        <el-button
+          class="fr"
+          v-if="status === '2' && powers.some((item) => item == '049')"
+          type="primary"
+          plain
+          :size="'mini'"
+          style="margin: 0 0 0 10px"
+          @click="wellReturnCode"
+          >确认收货
+        </el-button>
       </div>
       <!-- 
       <status-bar
@@ -106,12 +116,13 @@
                 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 +451,7 @@ export default {
           label: "供应商承担",
         },
       ],
-      queryId:"",
+      queryId: "",
       did: "", //详情页上的id
     };
   },