Merge branch 'master' into 'master'

优化追溯码销售退货流程

See merge request lighter/vue-intergration-platform!165

src/views/yp-codg/YpCodgUpload.vue

@@ -937,6 +937,9 @@
                     <span v-else-if="scope.row.uploadFlag === '0'"
                       >上传失败</span
                     >
+                    <span v-else-if="scope.row.uploadFlag === '-2'"
+                    >已撤销</span
+                    >
                     <span v-else>{{ scope.row.uploadFlag }}</span>
                   </template>
                 </el-table-column>
@@ -1180,6 +1183,7 @@ const retOptions = [
   { value: "", label: "全部" },
   { value: "1", label: "上传成功" },
   { value: "0", label: "上传失败" },
+  { value: "-2", label: "已撤销" },
 ];
 const editableTabsValue = ref("ypInvinfo");
 const start = formatDate(shortcuts[0].value[0]);
@@ -1691,17 +1695,34 @@ const deleteYpGoods = () => {
       });
       return false;
     }
-    deleteYpUploadBatch(uploadData.value)
-      .then(res => {
-        ElMessage({
-          type: "success",
-          message: res.msg,
-          duration: 2500,
-          showClose: true,
-        });
-        queryItem();
-      })
-      .catch(() => {});
+    if("ypSelinfoCx" === editableTabsValue.value){
+      // 退药和销售删除记录走3606A销售退货接口
+      uploadData.value[0].type = "0";
+      uploadYpSelinfoReturnBatch(uploadData.value)
+        .then(res => {
+          ElMessage({
+            type: "success",
+            message: res.msg,
+            duration: 2500,
+            showClose: true,
+          });
+          queryItem();
+        })
+        .catch(() => {});
+    } else {
+      // 其他的走3507A商品信息删除接口
+      deleteYpUploadBatch(uploadData.value)
+        .then(res => {
+          ElMessage({
+            type: "success",
+            message: res.msg,
+            duration: 2500,
+            showClose: true,
+          });
+          queryItem();
+        })
+        .catch(() => {});
+    }
   });
 };
 // 更新退货的发票号
@@ -1768,6 +1789,7 @@ const uploadYpSelinfoGoods = data => {
       })
       .catch(() => {});
   } else if (ztFlag.value === "4") {
+    data[0].type = "1";
     uploadYpSelinfoReturnBatch(data)
       .then(res => {
         ElMessage({