Merge branch 'master' into 'master'

优化追溯码上传

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

src/views/crb-manage/CrbBaseInfo.vue

@@ -97,7 +97,6 @@ import {
   uploadBaseUserData
 } from "@/api/crb-manage/crb-base-info.js";
 import {ElMessage, ElMessageBox} from "element-plus";
-import {updateMzDrugCodgData} from "@/api/yp-codg/yp-codg-match.js";
 
 const codeRs = ref('')
 const xm = ref('')

src/views/yp-codg/YpCodgUpload.vue

@@ -287,6 +287,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>