产品和资质问题修改

src/views/basic/product/productEdit.vue

@@ -725,7 +725,10 @@ export default {
       updatetSingleUdiInfo(this.editSingleFormat)
         .then((response) => {
           if (response.code == 20000) {
-            this.$emit("closePre", true);
+            let ttquery = {
+              id: this.relevanceEdit.id
+            }
+            this.getDetailList(ttquery);
             this.editSingleDiDialogVisible = false;
           } else {
             this.$message.error(response.message);

src/views/purchase/cert/supCertAddDialog.vue

@@ -250,7 +250,6 @@ export default {
     },
 
     onSubmit() {
-      this.loading = true;
       this.formData.customerId = this.inputQuery.customerId;
       if (this.formData.customerId == null) {
         this.formData.customerId = store.getters.customerId

src/views/supplier/company/basicCompanyProducts.vue

@@ -4,7 +4,7 @@
       <el-form :model="filterQuery" size="mini" label-width="120px" v-show="showSearch">
         <el-row>
           <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>
@@ -73,7 +73,7 @@
                 highlight-current-row>
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
-        <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
+        <el-table-column label="物资编码" prop="thirdId" 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>
@@ -91,7 +91,7 @@
                        :disabled="scope.row.originUuid!=null || scope.row.lockStatus===3"
                        @click.native.stop="intentSelectUdi(scope.row)">关联DI
             </el-button>
-            <el-button type="text" size="small"
+            <el-button type="text" size="small" :disabled="scope.row.lockStatus==3"
                        @click.native.stop="handleModifyClick(scope.row)">编辑
             </el-button>
             <el-button type="text" size="small"

src/views/supplier/products/selectDIDetailDialog.vue

@@ -10,10 +10,10 @@
                 </el-button-group>
               </el-row>
 
-              <el-row v-if="editQuery.isAudit==2">
+              <el-row>
                 <el-col :span="12">
                   <el-form-item label="审核意见:">
-                    <el-input style="width: 90%"  size="small" splaceholder="请输入审核意见" v-model="remark"></el-input>
+                    <el-input style="width: 90%"  size="small" :disabled="editQuery.isAudit!=2" splaceholder="请输入审核意见" v-model="remark"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -285,6 +285,10 @@ export default {
         type: Object,
         required: true,
       },
+      remark: {
+        type: Object,
+        required: true,
+      }
     },
     data() {
         return {

src/views/supplier/products/supAddDiProductSelectUdi.vue

@@ -3,21 +3,45 @@
     <el-card class="el-card">
         <el-form :model="unionQuery" size="mini" label-width="130px" v-show="showSearch">
           <el-row>
-            <el-col :span="6">
+            <el-col :span="12">
             <el-form-item label="UDI码:">
               <el-input v-model="unionQuery.udiCode" style="width: 90%" placeholder="请扫描或输入UDI码"
                         clearable="true" @keyup.enter.native="keyup_submit($event)"></el-input>
             </el-form-item>
             </el-col>
+          </el-row>
+
+          <el-row>
             <el-col :span="6">
-            <el-form-item label="DI:">
+              <el-form-item label="DI:">
-              <el-input  v-model="unionQuery.nameCode" style="width: 90%"  clearable="true" size="mini"
+                <el-input  v-model="unionQuery.nameCode" style="width: 90%"  clearable="true" size="mini"
-                         placeholder="请输入完整DI"
+                           placeholder="请输入完整DI"
-                         @keyup.enter.native="keyup_submit($event)"></el-input>
+                           @keyup.enter.native="keyup_submit($event)"></el-input>
-            </el-form-item>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="规格型号:">
+                <el-input
+                  v-model="unionQuery.ggxh" clearable="true"
+                  style="width: 90%"
+                  :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
+                  placeholder="规格型号"
+                  size="mini"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="注册证:">
+                <el-input
+                  v-model="unionQuery.zczbhhzbapzbh" clearable="true"
+                  style="width: 90%"
+                  :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
+                  placeholder="注册证/备案号"
+                  size="mini"
+                ></el-input>
+              </el-form-item>
             </el-col>
           </el-row>
-
           <el-row>
             <el-col :span="6">
             <el-form-item label="医疗器械注册人:">
@@ -55,28 +79,6 @@
               ></el-input>
             </el-form-item>
             </el-col>
-            <el-col :span="6">
-            <el-form-item label="规格型号:">
-              <el-input
-                v-model="unionQuery.ggxh" clearable="true"
-                style="width: 90%"
-                :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
-                placeholder="规格型号"
-                size="mini"
-              ></el-input>
-            </el-form-item>
-            </el-col>
-            <el-col :span="6">
-            <el-form-item label="注册证:">
-              <el-input
-                v-model="unionQuery.zczbhhzbapzbh" clearable="true"
-                style="width: 90%"
-                :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
-                placeholder="注册证/备案号"
-                size="mini"
-              ></el-input>
-            </el-form-item>
-            </el-col>
           </el-row>
         </el-form>
 

src/views/supplier/products/supDiProductsCheck.vue

@@ -111,6 +111,7 @@
       <selectDiDetail
         :editQuery="thisData"
         :editDate="editDate"
+        :remark="editDate.remark"
         :close="close"
       >
       </selectDiDetail>
@@ -292,6 +293,7 @@ export default {
         })
     },
     detailDialog(row,type) {
+      debugger
       if(type==1){
         this.title="产品信息详情"
       }else{
@@ -311,6 +313,7 @@ export default {
           }
         })
       }else{
+        debugger
         this.thisDetail = row;
         this.thisDetail.isAudit=type
         this.thrProductsDetailVisible = true;