单据审核验收外网兼容委托验收，

src/views/basic/product/udiInfoManageSp.vue

@@ -28,14 +28,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="产品编码:">
+            <el-form-item label="物资编码:">
               <el-input v-model="filterQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="产品通用名:">
+            <el-form-item label="物资名称:">
-              <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入产品通用名"
+              <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
@@ -67,8 +67,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="第三方产品编码:">
+            <el-form-item label="第三方物资编码:">
-              <el-input v-model="filterQuery.thrPiId" style="width: 90%" placeholder="请输入第三方产品编码"
+              <el-input v-model="filterQuery.thrPiId" style="width: 90%" placeholder="请输入第三方物资编码"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
@@ -91,7 +91,6 @@
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
           <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
-          <el-button type="primary" icon="el-icon-bottom-right" @click="selectProduct()">选入产品</el-button>
           <el-button type="primary" icon="search" @click="lockProducts('3')" v-if="isSpCombine">锁定</el-button>
           <el-button type="primary" icon="search" @click="lockProducts('1')" v-if="isSpCombine">退回</el-button>
         </el-button-group>
@@ -99,17 +98,17 @@
       <el-divider style="margin: 15px"></el-divider>
 
       <el-table v-loading="loading" :data="list" key="1" @selection-change="handleSelectionChange" style="width: 100%"
-                border highlight-current-row>
+                border>
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="供应商" prop="companyName" show-overflow-tooltip></el-table-column>
         <el-table-column label="最小销售产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
-        <el-table-column label="主系统产品编码" prop="mainId" show-overflow-tooltip></el-table-column>
+        <el-table-column label="主系统物资编码" prop="mainId" show-overflow-tooltip></el-table-column>
         <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
-        <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+        <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
-        <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
-        <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
+        <el-table-column label="物资分类" prop="classifyName" show-overflow-tooltip></el-table-column>
         <el-table-column
           v-if="isSpCombine"
           label="状态"
@@ -125,7 +124,6 @@
         <el-table-column width="120" label="操作">
           <template slot-scope="scope">
             <el-button type="text" @click.native.stop="handleModifyClick(scope.row)">详情</el-button>
-            <el-button type="text" @click.native.stop="deleteClick(scope.row)">移除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -147,20 +145,7 @@
         </selectDetail>
       </el-dialog>
 
-      <el-dialog
+
-        title="选入产品信息"
-        :visible.sync="selectProductVisible"
-        width="85%"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        v-if="selectProductVisible"
-      >
-        <selectProduct
-          :closeSelDialog="closeDialog"
-          :uuid="uuid"
-          :unitFk="filterQuery.unitFk"
-        ></selectProduct>
-      </el-dialog>
 
       <pagination
         v-show="total>0"
@@ -188,7 +173,6 @@ import {selectSysParamByKey} from "@/api/param/systemParamConfig";
 import {filterByUuid, filterCompany} from "@/api/basic/udiInfo";
 import {filterCompanyProductRelevance, deleteCompanyProductRelevance} from "@/api/basic/udiRlSuptRelevance";
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain"
-import selectProduct from "./basicCompanyProductsImport";
 import selectUdi from "./udiInfoRelevance.vue";
 import selectErp from "./udiInfoselectErpUdi";
 import selectLocalUdi from "./UdiInfoSelectLocalUdi";
@@ -324,6 +308,7 @@ export default {
 
       deletetUdiInfos(tquery)
         .then((response) => {
+          this.loading = false;
           if (response.code == 20000) {
             this.getList();
             this.$message({
@@ -454,7 +439,6 @@ export default {
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
-
     cancelDialog() {
       this.editDialogVisible = false;
     },
@@ -480,38 +464,6 @@ export default {
       this.checked = row.isUseDy == 1;
     },
 
-
-    deleteClick(row) {
-      this.$confirm("是否删除?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(() => {
-        this.productLoading = true;
-        let tquery = {
-          id: row.id,
-        };
-        deleteCompanyProductRelevance(tquery)
-          .then((response) => {
-            this.productLoading = false;
-            if (response.code === 20000) {
-              this.getList();
-              this.$message({
-                type: "success",
-                message: "删除成功！",
-              });
-            } else {
-              this.$message.error(response.message);
-            }
-          })
-          .catch(() => {
-            this.productLoading = false;
-          });
-      }).catch(() => {
-      });
-    },
-
-
     lockProducts(status) {
       let selectData = this.multipleSelection;
       let postQuery = {
@@ -598,7 +550,6 @@ export default {
       this.selectErpDialogVisible = false;
       this.selectLocalVisible = false;
       this.selectVersionVisible = false;
-      this.selectProductVisible = false;
     },
     onAddSubmit() {
       if (this.checked == true) {
@@ -683,14 +634,6 @@ export default {
           this.fromOptions = [];
         });
     },
-    selectProduct() {
-      if (this.$isBlank(this.filterQuery.unitFk)) {
-        this.$message.error("请先选择供应商！");
-        return;
-      }
-      this.selectProductVisible = true;
-    },
-
   }
   ,
   mounted() {
@@ -700,7 +643,6 @@ export default {
     selectUdi,
     selectErp,
     selectLocalUdi,
-    selectProduct,
     selectDetail
   }
   ,

src/views/inout/DialogNewReviewOrder.vue

@@ -257,14 +257,20 @@ export default {
     },
 
     searchOrder() {
+      debugger
       let query = {
         billNo: this.formData.billNo
       };
       reviewSpms(query)
         .then((response) => {
           this.detailLoading = false;
-          this.detailList = response.data.orderDetailEntities || [];
+          if (response.code == 20000) {
-          this.formData = response.data.orderEntity;
+            this.detailList = response.data.orderDetailEntities || [];
+            this.formData = response.data.orderEntity;
+          } else {
+            this.$message.error(response.message);
+          }
+
         })
         .catch(() => {
           this.detailLoading = false;

src/views/inout/IoCheckAuditOrder.vue

@@ -51,6 +51,7 @@
             </el-form-item>
           </el-col>
         </el-row>
+
         <el-row>
           <el-col :span="6">
             <el-form-item class="query-form-item" label="创建时间:">
@@ -92,7 +93,7 @@
       <el-divider style="margin: 15px"></el-divider>
       <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
                 border
-                @current-change="handleSelectionChange">
+                @row-click="handleSelectionChange">
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="送货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
         <el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
@@ -133,23 +134,7 @@
             </el-tag>
           </template>
         </el-table-column>
-        <!--        <el-table-column label="验收状态" prop="status" width="100">-->
+        <el-table-column label="操作" width="160" fixed="right">
-        <!--          <template slot-scope="scope">-->
-        <!--            <el-tag :type="statusFilterType(scope.row.status)">{{-->
-        <!--                reviceStatus[scope.row.status]-->
-        <!--              }}-->
-        <!--            </el-tag>-->
-        <!--          </template>-->
-        <!--        </el-table-column>-->
-        <!--        <el-table-column label="审核状态" prop="status" width="100">-->
-        <!--          <template slot-scope="scope">-->
-        <!--            <el-tag :type="statusFilterType(scope.row.status)">{{-->
-        <!--                checkStatus[scope.row.status]-->
-        <!--              }}-->
-        <!--            </el-tag>-->
-        <!--          </template>-->
-        <!--        </el-table-column>-->
-        <el-table-column label="操作" width="200" fixed="right">
           <template slot-scope="scope">
 
             <el-button
@@ -172,7 +157,7 @@
               type="text"
               size="small"
               @click.native.stop="reviewOrder(scope.row)"
-            >审核/验收
+            >审核
             </el-button
             >
 
@@ -667,9 +652,10 @@ export default {
       resultDetailList: [],
       acceptQuery: null,
       acceptOrderVisible: false,
+      newAcceptOrderVisible: false,
     };
   },
-  components: {AcceptOrder, ElImageViewer},
+  components: {AcceptOrder, NewAcceptOrder,ElImageViewer},
   methods: {
     onReset() {
       this.$router.push({
@@ -1048,6 +1034,11 @@ export default {
       this.acceptOrderVisible = true;
     },
 
+
+    newReview() {
+      this.newAcceptOrderVisible = true;
+    },
+
     parentByFn: function (childValue) {
       this.getList();
     },
@@ -1090,3 +1081,4 @@ export default {
 <style type="text/scss" lang="scss">
 </style>
 
+