1.修改部分字段文字显示

2.调整关联客户平台操作逻辑和错误提示

src/views/basic/UdiInfoManage.vue

@@ -14,18 +14,21 @@
             <el-row>
                 <el-form-item class="query-form-item">
                     <el-input
+                        clearable
                         v-model="filterQuery.cpmctymc"
                         placeholder="产品通用名"
                     ></el-input>
                 </el-form-item>
                 <el-form-item class="query-form-item">
                     <el-input
+                        clearable
                         v-model="filterQuery.ggxh"
                         placeholder="规格型号"
                     ></el-input>
                 </el-form-item>
                 <el-form-item class="query-form-item">
                     <el-input
+                        clearable
                         v-model="filterQuery.cpms"
                         placeholder="产品描述"
                     ></el-input>
@@ -33,7 +36,7 @@
                 <el-form-item class="query-form-item">
                     <el-input
                         v-model="filterQuery.zczbhhzbapzbh"
-                        placeholder="注册/备案号"
+                        placeholder="注册/备案凭证号"
                     ></el-input>
                 </el-form-item>
             </el-row>
@@ -41,18 +44,21 @@
             <el-row>
                 <el-form-item class="query-form-item">
                     <el-input
+                        clearable
                         v-model="filterQuery.ylqxzcrbarmc"
-                        placeholder="注册/备案人"
+                        placeholder="医疗器械注册人"
                     ></el-input>
                 </el-form-item>
                 <el-form-item class="query-form-item">
                     <el-input
+                        clearable
                         v-model="filterQuery.manufactory"
                         placeholder="生产企业"
                     ></el-input>
                 </el-form-item>
                 <el-form-item class="query-form-item">
                     <el-input
+                        clearable
                         v-model="filterQuery.thirdId"
                         placeholder="第三方产品编码"
                     ></el-input>

src/views/sys/bindPlatform.vue

@@ -5,14 +5,6 @@
                 <el-form-item class="query-form-item">
                     <el-input v-model="query.key" style="width: 300px;" placeholder="搜索"></el-input>
                 </el-form-item>
-                <el-form-item class="query-form-item">
-                    <el-select v-model="query.corpType" placeholder="往来单位类型">
-                        <el-option label="全部" value=""></el-option>
-                        <el-option label="客户" value="1"></el-option>
-                        <el-option label="供应商" value="2"></el-option>
-                        <el-option label="特殊往来" value="4"></el-option>
-                    </el-select>
-                </el-form-item>
                 <el-form-item>
                     <el-button-group>
                         <el-button
@@ -42,11 +34,6 @@
             <el-table-column label="序号" type="index" fixed></el-table-column>
             <el-table-column label="往来单位编码" prop="unitId" fixed></el-table-column>
             <el-table-column label="往来单位名称" prop="corpName" fixed></el-table-column>
-            <el-table-column label="往来单位类型" prop="coryType" fixed>
-                <template slot-scope="scope">
-                    <span>{{ coryTypeArr[scope.row.corpType] }}</span>
-                </template>
-            </el-table-column>
             <el-table-column label="拼音码" prop="pinyinCode" fixed></el-table-column>
             <el-table-column label="医院客户名称" prop="platformName" fixed></el-table-column>
             <el-table-column label="操作" fixed="right">
@@ -307,12 +294,7 @@ export default {
                         value: 4,
                         label: "特殊往来"
                     }
-            ],
+                ]
-            coryTypeArr: {
-                1: "客户",
-                2: "供应商",
-                4: "特殊往来"
-            }
             };
         },
 
@@ -394,6 +376,7 @@ export default {
             getUnitMaintain() {
                 let unitQuery = {
                     customerId: this.$store.getters.customerId,
+                    corpType: 1,
                     page: 1,
                     limit: 20
                 };
@@ -503,9 +486,46 @@ export default {
                 });
             },
             linkSubmit() {
+                //判断此用户是否已经添加过
+                let corpId = this.editLogin.corpName;
+                if (!this.editDialogVisible) {
+                    let corpNameTemp = null;
+                    this.corpNamesList.forEach(item => {
+                        if (item.id == this.editLogin.corpName) {
+                            corpNameTemp = item.name;
+                            corpId = item.id;
+                            return;
+                        }
+                    });
+
+                    let flag = false;
+                    //此时为添加
+                    this.list.forEach(item => {
+                        if (item.corpName == corpNameTemp) {
+                            flag = true;
+                            return;
+                        }
+                    });
+
+                    if (flag) {
+                        this.$message.error('“' + corpNameTemp + '”' + " 已经关联");
+                        return;
+                    }
+
+                } else {
+                    let corpNameTemp = null;
+                    this.corpNamesList.forEach(item => {
+                        if (item.name == this.editLogin.corpName) {
+                            corpNameTemp = item.name;
+                            corpId = item.id;
+                            return;
+                        }
+                    });
+                }
+
                 this.$refs["editLogin"].validate((valid) => {
                     if (valid) {
-                    this.editLogin.id = this.editLogin.corpName;
+                        this.editLogin.id = corpId;
                         linkPlatform(this.editLogin)
                             .then((response) => {
                                 if (response.code == 20000) {

src/views/warehouse/InvProducts.vue

@@ -1,7 +1,8 @@
 <template>
     <div>
-        <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
+       <el-card>
-            <el-row>
+           <el-form :inline="true" :model="filterQuery" size="mini">
+               <el-row style="width: 100%;">
                    <el-form-item class="query-form-item">
                        <el-input v-model="filterQuery.nameCode" placeholder="最小销售产品标识" :clearable="true"></el-input>
                    </el-form-item>
@@ -15,7 +16,7 @@
                        <el-input v-model="filterQuery.batchNo" placeholder="批次号" :clearable="true"></el-input>
                    </el-form-item>
                </el-row>
-            <el-row>
+               <el-row style="width: 100%;">
                    <el-form-item class="query-form-item">
                        <el-input v-model="filterQuery.manufactory" placeholder="生产厂家" :clearable="true"></el-input>
                    </el-form-item>
@@ -63,7 +64,7 @@
                    </template>
                </el-table-column>
            </el-table>
-
+       </el-card>
 
         <el-dialog
             title="库存详情"

src/views/warehouse/stockOrderDelSearch.vue

@@ -147,7 +147,7 @@
                 <el-table-column label="生产日期" width="120" prop="produceDate"></el-table-column>
                 <el-table-column label="失效日期" width="120" prop="expireDate"></el-table-column>
                 <el-table-column label="数量" width="100" prop="count"></el-table-column>
-                <el-table-column label="价格" width="120" prop="price">
+                <el-table-column label="单价" width="120" prop="price">
                     <template slot-scope="scope">
                         <el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.price"
                                   placeholder="请输入"></el-input>
@@ -561,12 +561,16 @@ export default {
                 }
             },
             printOrder(row) {
-            let tQuery = { queryId: row.orderId };
+                let tQuery = {
+                    queryId: row.orderId,
+                    moduleId: 4
+                };
                 this.loading = true;
                 inspectionStockOrderPDFFromTemplateFile(tQuery).then((response) => {
                     if (response.code === 20000) {
                         tQuery = {
-                        orderId: row.orderId
+                            orderId: row.orderId,
+                            moduleId: 4
                         };
                         stockOrderPDFFromTemplateFile(tQuery).then((response) => {
                             //将pdf文件转换为url。