From 5a2ed31531d3c9252c419e88aa330a3b1631efb3 Mon Sep 17 00:00:00 2001
From: zhengmingliang <hongtianzai@126.com>
Date: Tue, 15 Nov 2022 15:58:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=87=AA=E5=8A=A9=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/BusTypeChange.vue             |  19 +-
 src/views/basic/invWarehouse.vue              | 166 +++++++++++++++---
 src/views/business/stockOrderDelSearch.vue    |   4 +-
 src/views/purchase/purApply.vue               |   6 +-
 src/views/purchase/purApplyEditDiaolog.vue    |  15 +-
 src/views/purchase/purPlan.vue                |   6 +-
 src/views/purchase/purPlanAudit.vue           |   4 +-
 src/views/purchase/purPlanEditDialog.vue      |  12 +-
 src/views/purchase/purPlanSearch.vue          |   2 +-
 src/views/purchase/pureApplyAudit.vue         |   3 +-
 src/views/purchase/pureApplyDetailDialog.vue  |   1 +
 src/views/purchase/pureApplySearch.vue        |   6 +-
 src/views/purchase/supCertAddDialog.vue       |   4 +-
 src/views/purchase/supCertSet.vue             |  12 +-
 src/views/purchase/supCertificationAdd.vue    |  13 +-
 src/views/purchase/supCompanyAduditDialog.vue |   9 +
 .../purchase/supManufacturerEditDialog.vue    |  90 ++++++----
 src/views/purchase/supProductEditDialog.vue   |  29 ++-
 src/views/thrsys/ThrOrdedrReceiveAdd.vue      |   5 +-
 src/views/thrsys/ThrOrdedrReceiveSearch.vue   |   2 +-
 src/views/thrsys/thrOrderNew.vue              |   2 +-
 21 files changed, 322 insertions(+), 88 deletions(-)

diff --git a/src/views/basic/BusTypeChange.vue b/src/views/basic/BusTypeChange.vue
index de940cd..194696a 100644
--- a/src/views/basic/BusTypeChange.vue
+++ b/src/views/basic/BusTypeChange.vue
@@ -4,11 +4,24 @@
             <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
                 <el-form-item class="query-form-item">
                     <el-input
-                        v-model="filterQuery.name"
-                        placeholder="业务类型"
-                        style="width: 400px"
+                        v-model="filterQuery.originName"
+                        placeholder="单据类型名称"
+                        style="width: 200px"
                     ></el-input>
                 </el-form-item>
+                <el-form-item class="query-form-item">
+                    <el-input
+                        v-model="filterQuery.originAction"
+                        placeholder="单据类型代码"
+                        style="width: 200px"
+                    ></el-input>
+                </el-form-item>
+                <el-form-item class="query-form-item">
+                    <el-select v-model="filterQuery.type">
+                         <el-option v-for="(item,index) in typeMap" :key="index" :label="item" :value="index">
+                         </el-option>
+                    </el-select>
+                </el-form-item>
                 <el-form-item>
                     <el-button-group style="margin-left: 10px;display:flex;">
                         <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue
index 8cf3119..ca8cc62 100644
--- a/src/views/basic/invWarehouse.vue
+++ b/src/views/basic/invWarehouse.vue
@@ -168,7 +168,7 @@
                         <el-button
                             type="text"
                             size="small" :disabled="!configParms.basicInv"
-                            @click.native.stop="addBussinessType(scope.row)"
+                            @click.native.stop="selsectBussinessType(scope.row)"
                         >管理单据类型
                         </el-button
                         >
@@ -346,6 +346,53 @@
             </div>
 
         </el-dialog>
+        
+        <!--添加单据类型弹窗---->
+ <!--添加单据类型弹窗-->
+ <el-dialog
+            title="仓库关联单据类型"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            :visible.sync="userBussinessTypeFormVisible"
+        >
+        <el-row type="flex" justify="end">
+                <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
+                    <el-button
+                        type="primary"
+                        @click.native="addBussinessType()"
+                        :loading="loading"
+                    >选入
+                    </el-button
+                    >
+                </el-button-group>
+            </el-row>
+            <el-table v-loading="loading" :data="userBussinessTypeList" ref="typeList"
+                      style="width: 100%">
+                <el-table-column label="单据类型编码" prop="action" fixed></el-table-column>
+                <el-table-column label="单据类型名称" prop="name" fixed></el-table-column>
+                <el-table-column label="操作" fixed="right">
+                    <template slot-scope="scope">
+                        <el-button
+                            type="text"
+                            size="small"
+                            :disabled="!configParms.basicInv"
+                            @click.native.stop="delWarehouseBussinessType(scope.row.id)"
+                        >移除
+                        </el-button
+                        >
+                    </template>
+                 
+                </el-table-column>
+            </el-table>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click.native="userBussinessTypeFormVisible = !userBussinessTypeFormVisible"
+                >取消
+                </el-button
+                >
+            </div>
+
+        </el-dialog>
+
         <!--表单界面-->
         <el-dialog
             :title="formMap[formName]"
@@ -727,7 +774,7 @@ import {
     warehouseUserList, saveWarehouseBussinessType,
     saveWarehouseUser, updateDirector, disableWarehouse,
     deleteWarehouseBussinessType,
-    bindThrWarehouse, unbindThrWarehouse, filterThridSubByInv, getThrsysDetail
+    bindThrWarehouse, unbindThrWarehouse, filterThridSubByInv, getThrsysDetail,delWarehouseBussinessType
 } from "../../api/basic/invWarehouse";
 import {
     filterSubAll, saveSubWarehouse, deleteSubWarehouse,
@@ -831,6 +878,8 @@ export default {
             currentSubId: null,
             thrWareHouseVisible: false,
             thrSubWareHouseVisible: false,
+            userBussinessTypeList:[],
+            userBussinessTypeFormVisible:false,
             sysList: [],
             sysSubList: [],
             checkThrWarehouseRow: null,
@@ -877,7 +926,8 @@ export default {
             bussinessTypeQuery: {
                 enabled: true,
                 page: 1,
-                limit: 10
+                limit: 10,
+                ids:""
             },
             bussinessTypeTotal: 0,
             curSeleUser: null,
@@ -1355,10 +1405,15 @@ export default {
                 })
             });
         },
-        getBussinessType(val) {
+        getBussinessType(val,obj) {
             if (val != null) {
                 this.bussinessTypeQuery.page = val;
             }
+            if(obj!=undefined){
+                var action=obj.toString();
+                this.bussinessTypeQuery.ids=action;
+            }
+           
             this.bussinessTypeQuery.code=this.busQuery.code;
             getJoinBussinessType(this.bussinessTypeQuery).then((res) => {
                 this.selectBussinessTypeList = [];
@@ -1435,20 +1490,42 @@ export default {
                 });
             }
         },
+        // addBussinessType(row) {
+        //     this.currentCode = row.code;
+        //     this.currentRow = row;
+        //     this.loadLinkData(row);
+        //     if (this.currentCode == null || this.currentCode == '') {
+        //         this.$message.error('请先选择仓库');
+        //     } else if (this.currentCode != row.code) {
+        //         this.$message.error("请先选择当前分库！")
+        //     } else {
+        //         this.bussinessTypeFormVisible = true;
+        //         this.bussinessTypeQuery.page = 1;
+        //         this.getBussinessType();
+        //     }
+        // },
         addBussinessType(row) {
-            this.currentCode = row.code;
-            this.currentRow = row;
-            this.loadLinkData(row);
-            if (this.currentCode == null || this.currentCode == '') {
-                this.$message.error('请先选择仓库');
-            } else if (this.currentCode != row.code) {
-                this.$message.error("请先选择当前分库！")
-            } else {
+            var action=[];
+                for(var i=0;i<this.userBussinessTypeList.length;i++){
+                    action.push(this.userBussinessTypeList[i].action);
+                }
                 this.bussinessTypeFormVisible = true;
                 this.bussinessTypeQuery.page = 1;
-                this.getBussinessType();
-            }
+                this.getBussinessType(1,action);
         },
+        selsectBussinessType(row){
+          var busQuery = {
+                      code: this.currentCode,
+                      page: 1,
+                      limit: 10000
+                  }
+          warehouseBussinessTypeList(busQuery).then((res) => {
+                  this.userBussinessTypeList = res.data.list;
+              }).catch((error) => {
+                  this.$message.error("单据类型数据加载失败")
+              });
+          this.userBussinessTypeFormVisible = true;
+      },
         addBussinessTypeData() {
             // if (this.selectBussinessTypeList.length == 0) {
             //     this.$message.error("请选择单据类型")
@@ -1475,6 +1552,7 @@ export default {
                         this.bussinessTypeData = [];
                         this.busTotal = 0;
                     });
+                    this.selectWhouseBussinessType();
                 } else {
                     this.$message.error(res.message);
                 }
@@ -1484,6 +1562,17 @@ export default {
             });
             // }
         },
+        selectWhouseBussinessType(){
+            var busQuery = {
+                        code: this.currentCode,
+                        page: 1,
+                        limit: 100000
+                    }
+                    warehouseBussinessTypeList(busQuery).then((res) => {
+                        this.userBussinessTypeList = res.data.list || [];
+                    }).catch((error) => {
+                    });
+        },
         updateDirector(row) {
             row.director = !row.director;
             updateDirector(row).then((res) => {
@@ -1506,20 +1595,55 @@ export default {
             this.curSeleUser = row;
             this.relBusUserVisile = true;
         },
+       //删除仓库关联单据
+       handleUserSubDel(row){
+            if (row.id) {
+                this.$confirm("确认移除单据吗?", "提示", {
+                    type: "warning",
+                })
+                    .then(() => {
+                        this.deleteLoading = true;
+                        let para = {id: row.id};
+                        deleteSubWarehouse(para)
+                            .then((response) => {
+                                this.deleteLoading = false;
+                                if (response.code !== 20000) {
+                                    this.$message.error(response.message);
+                                    return false;
+                                }
+                                this.$message.success("删除成功");
+                                this.loadSubData(row.parentId);
+                            })
+                            .catch(() => {
+                                this.deleteLoading = false;
+                            });
+                    })
+                    .catch(() => {
+                        this.$message.info("取消删除");
+                    });
+            }
+        },
 
         delWarehouseBussinessType(id) {
             let params = {id: id};
             deleteWarehouseBussinessType(params).then((res) => {
                 if (res.code == 20000) {
                     this.$message.success("已移除");
-                    for (let i = 0; i < this.bussinessTypeData.length; i++) {
-                        if (this.bussinessTypeData[i].id == id) {
-                            this.bussinessTypeData.splice(i, 1);
-                            return;
-                        }
-                    }
+                    this.bussinessTypeData = [];
+                    this.selectWhouseBussinessType();
+              var busQuerys = {
+                        code: this.currentCode,
+                        page: 1,
+                        limit: 10
+                    }
+            warehouseBussinessTypeList(busQuerys).then((res) => {
+                    this.bussinessTypeData = res.data.list;
+                }).catch((error) => {
+                    this.$message.error("单据类型数据加载失败")
+                });
+
                 } else {
-                    this.$message.error("移除失败");
+                    this.$message.error(res.message);
                 }
             }).catch((error) => {
                 this.$message.error("移除失败");
diff --git a/src/views/business/stockOrderDelSearch.vue b/src/views/business/stockOrderDelSearch.vue
index 8705f80..f9fcf68 100644
--- a/src/views/business/stockOrderDelSearch.vue
+++ b/src/views/business/stockOrderDelSearch.vue
@@ -146,12 +146,12 @@
                                 平衡补单
                             </el-button>
                         </div>
-                        <el-button
+                        <!-- <el-button
                             type="text"
                             size="small"
                             @click.native="rollback(scope.row)"
                         >撤回
-                        </el-button>
+                        </el-button> -->
                         <el-button
                             v-if="scope.row.uploadFlag"
                             type="text"
diff --git a/src/views/purchase/purApply.vue b/src/views/purchase/purApply.vue
index 61cd1b9..1740a12 100644
--- a/src/views/purchase/purApply.vue
+++ b/src/views/purchase/purApply.vue
@@ -61,9 +61,9 @@
 
                 <el-table-column label="操作" fixed="right">
                     <template slot-scope="scope">
-                        <el-button type="text" size="small" @click.native.stop="submitOrder(scope.row)"
+                        <!-- <el-button type="text" size="small" @click.native.stop="submitOrder(scope.row)"
                         >提交
-                        </el-button>
+                        </el-button> -->
                         <el-button
                             type="text"
                             size="small"
@@ -88,7 +88,7 @@
         <el-card class="el-card">
             <el-table v-loading="loading" :data="detailList" style="width: 100%">
                 <el-table-column label="序号" type="index" width="120"></el-table-column>
-                <el-table-column label="产品编码" prop="productId"></el-table-column>
+                <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
                 <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
diff --git a/src/views/purchase/purApplyEditDiaolog.vue b/src/views/purchase/purApplyEditDiaolog.vue
index 53c84ee..7006835 100644
--- a/src/views/purchase/purApplyEditDiaolog.vue
+++ b/src/views/purchase/purApplyEditDiaolog.vue
@@ -95,7 +95,18 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
-
+                <el-row :gutter="20" style="margin-top: -10px" v-show="formData.status==4">
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>拒绝原因：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item >
+                            <el-input v-model="formData.auditRemark" auto-complete="off" :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
 
             </el-card>
 
@@ -272,7 +283,7 @@ export default {
                         this.$message.warning('未添加产品');
                         return;
                     }
-                    if (status === '0') {
+                    if (status === '2') {
                         for (let i = 0; i < this.codeArray.length; i++) {
                             if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
                                 return this.$message.error('单据数量不能为0');
diff --git a/src/views/purchase/purPlan.vue b/src/views/purchase/purPlan.vue
index f8de056..2ce032d 100644
--- a/src/views/purchase/purPlan.vue
+++ b/src/views/purchase/purPlan.vue
@@ -61,9 +61,9 @@
 
                 <el-table-column label="操作" fixed="right">
                     <template slot-scope="scope">
-                        <el-button type="text" size="small" @click.native.stop="submitOrder(scope.row)"
+                        <!-- <el-button type="text" size="small" @click.native.stop="submitOrder(scope.row)"
                         >提交
-                        </el-button>
+                        </el-button> -->
                         <el-button
                             type="text"
                             size="small"
@@ -88,7 +88,7 @@
         <el-card class="el-card">
             <el-table v-loading="loading" :data="detailList" style="width: 100%">
                 <el-table-column label="序号" type="index" width="120"></el-table-column>
-                <el-table-column label="产品编码" prop="productId"></el-table-column>
+                <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
                 <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
diff --git a/src/views/purchase/purPlanAudit.vue b/src/views/purchase/purPlanAudit.vue
index fa07482..aa98b61 100644
--- a/src/views/purchase/purPlanAudit.vue
+++ b/src/views/purchase/purPlanAudit.vue
@@ -61,7 +61,7 @@
                         <el-button
                             type="text"
                             size="small"
-                            :disabled=" scope.row.status==3"
+                            :disabled=" scope.row.status==2"
                             @click.native="newDistributionForm(scope.$index, scope.row)"
                         >审核
                         </el-button
@@ -83,7 +83,7 @@
         <el-card class="el-card">
             <el-table v-loading="loading" :data="detailList" style="width: 100%">
                 <el-table-column label="序号" type="index" width="120"></el-table-column>
-                <el-table-column label="产品编码" prop="productId"></el-table-column>
+                <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
                 <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
diff --git a/src/views/purchase/purPlanEditDialog.vue b/src/views/purchase/purPlanEditDialog.vue
index 99f3eb4..e40729d 100644
--- a/src/views/purchase/purPlanEditDialog.vue
+++ b/src/views/purchase/purPlanEditDialog.vue
@@ -121,6 +121,16 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
+                <el-col :span="3" v-show="formData.status==4">
+                       <div class="ao-text">
+                            <span>拒绝原因：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7" v-show="formData.status==4">
+                        <el-form-item >
+                            <el-input v-model="formData.auditRemark" auto-complete="off" :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
 
 
             </el-card>
@@ -299,7 +309,7 @@ export default {
                         this.$message.warning('未添加产品');
                         return;
                     }
-                    if (status === '0') {
+                    if (status === '2') {
                         for (let i = 0; i < this.codeArray.length; i++) {
                             if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
                                 return this.$message.error('单据数量不能为0');
diff --git a/src/views/purchase/purPlanSearch.vue b/src/views/purchase/purPlanSearch.vue
index 30a7322..c67827b 100644
--- a/src/views/purchase/purPlanSearch.vue
+++ b/src/views/purchase/purPlanSearch.vue
@@ -82,7 +82,7 @@
         <el-card class="el-card">
             <el-table v-loading="loading" :data="detailList" style="width: 100%">
                 <el-table-column label="序号" type="index" width="120"></el-table-column>
-                <el-table-column label="产品编码" prop="productId"></el-table-column>
+                <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
                 <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
diff --git a/src/views/purchase/pureApplyAudit.vue b/src/views/purchase/pureApplyAudit.vue
index 545edfa..473a86d 100644
--- a/src/views/purchase/pureApplyAudit.vue
+++ b/src/views/purchase/pureApplyAudit.vue
@@ -69,6 +69,7 @@
                     <template slot-scope="scope">
                         <el-button
                             type="text"
+                            :disabled="scope.row.status!=2"
                             size="small"
                             @click.native="newDistributionForm(scope.$index, scope.row)"
                         >审核
@@ -91,7 +92,7 @@
         <el-card class="el-card">
             <el-table v-loading="loading" :data="detailList" style="width: 100%">
                 <el-table-column label="序号" type="index" width="120"></el-table-column>
-                <el-table-column label="产品编码" prop="productId"></el-table-column>
+                <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
                 <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
diff --git a/src/views/purchase/pureApplyDetailDialog.vue b/src/views/purchase/pureApplyDetailDialog.vue
index 2be73b0..e58f9ca 100644
--- a/src/views/purchase/pureApplyDetailDialog.vue
+++ b/src/views/purchase/pureApplyDetailDialog.vue
@@ -281,6 +281,7 @@ export default {
                 targetInv: null,
                 targetSubInv: null,
                 targetBillType: null,
+                auditRemark:"",
             },
             formRules: {},
             codeArray: [],
diff --git a/src/views/purchase/pureApplySearch.vue b/src/views/purchase/pureApplySearch.vue
index 0d13c15..a4e3b7b 100644
--- a/src/views/purchase/pureApplySearch.vue
+++ b/src/views/purchase/pureApplySearch.vue
@@ -11,14 +11,14 @@
                             clearable
                         ></el-input>
                     </el-form-item>
-                    <el-form-item class="query-form-item">
+                    <!-- <el-form-item class="query-form-item">
                         <el-select v-model="filterQuery.status" placeholder="审核状态">
                             <el-option label="全部" value=""></el-option>
                             <el-option label="未审核" value="2"></el-option>
                             <el-option label="已审核" value="3"></el-option>
                             <el-option label="已拒绝" value="4"></el-option>
                         </el-select>
-                    </el-form-item>
+                    </el-form-item> -->
                     <el-form-item class="query-form-item">
                         <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
                         <el-date-picker
@@ -90,7 +90,7 @@
         <el-card class="el-card">
             <el-table v-loading="loading" :data="detailList" style="width: 100%">
                 <el-table-column label="序号" type="index" width="120"></el-table-column>
-                <el-table-column label="产品编码" prop="productId"></el-table-column>
+                <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
                 <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
diff --git a/src/views/purchase/supCertAddDialog.vue b/src/views/purchase/supCertAddDialog.vue
index edd6d57..dfd178a 100644
--- a/src/views/purchase/supCertAddDialog.vue
+++ b/src/views/purchase/supCertAddDialog.vue
@@ -88,8 +88,8 @@
                     <el-col :span="8">
                         <el-form-item prop="need">
                             <el-select v-model="formData.status" style="width: 100%">
-                                <el-option label="禁用" :value=1></el-option>
-                                <el-option label="启用" :value=0></el-option>
+                                <el-option label="失效" :value=1></el-option>
+                                <el-option label="有效" :value=0></el-option>
                             </el-select>
                         </el-form-item>
                     </el-col>
diff --git a/src/views/purchase/supCertSet.vue b/src/views/purchase/supCertSet.vue
index b9c143c..75b55a1 100644
--- a/src/views/purchase/supCertSet.vue
+++ b/src/views/purchase/supCertSet.vue
@@ -360,9 +360,9 @@
                         <el-col :span="8">
                             <el-form-item prop="require">
                                 <el-select v-model="currentProduct.cplx" style="width: 100%">
-                                    <el-option label="全部" value="全部"></el-option>
-                                    <el-option label="器械" value="器械"></el-option>
-                                    <el-option label="试剂" value="试剂"></el-option>
+                                    <el-option label="全部"  key="全部" value="全部"></el-option>
+                                    <el-option label="器械"  key="器械" value="器械"></el-option>
+                                    <el-option label="试剂"  key="试剂" value="试剂"></el-option>
                                 </el-select>
                             </el-form-item>
                         </el-col>
@@ -501,7 +501,7 @@ export default {
                     {required: true, message: "证书名称", trigger: "blur"}
                 ],
                 need: [
-                    {required: true, message: "请选择是否必传", trigger: "blur"}
+                {required: true, message: "请选择是否禁用", trigger: "blur"}
                 ],
 
             },
@@ -535,10 +535,10 @@ export default {
 
             formManufactureRules: {
                 name: [
-                    {required: true, message: "证书名称", trigger: "blur"}
+                    {required: true, message: "请输入证书名称", trigger: "blur"}
                 ],
                 need: [
-                    {required: true, message: "请选择是否禁用", trigger: "blur"}
+                    {required: true, message: "请选择是否必传", trigger: "blur"}
                 ],
             },
 
diff --git a/src/views/purchase/supCertificationAdd.vue b/src/views/purchase/supCertificationAdd.vue
index 3b12ac4..166cfac 100644
--- a/src/views/purchase/supCertificationAdd.vue
+++ b/src/views/purchase/supCertificationAdd.vue
@@ -76,6 +76,7 @@
                         <el-button
                             type="text"
                             size="small"
+                            :disabled="scope.row.auditStatus === 1"
                             @click.native.stop="deleteDialog(scope.row)"
                         >删除
                         </el-button
@@ -184,6 +185,7 @@
                         <el-button
                             type="text"
                             size="small"
+                            :disabled="scope.row.auditStatus === 1"
                             @click.native="deleteRegistration(scope.row)"
                         >删除
                         </el-button
@@ -464,9 +466,18 @@ export default {
             this.getRegistrationList();
         },
         onSubmit2() {
+            if(this.currentManufacturer==null){
+                this.$message.error("请先选中生产企业！");
+                return
+            }
             this.getRegistrationList();
         },
         registrationDialog(row) {
+            if(this.currentManufacturer==null){
+                this.$message.error("请先选中生产企业！");
+                return
+            }
+
             if (this.$isNotBlank(row)) {
                 this.registrationId = row.id;
                 this.curProductQuery = row;
@@ -549,7 +560,7 @@ export default {
     created() {
         this.fileUrl = BASE_URL + "/udiwms/image/register/file/getImage?type=image4&name=";
         this.getList();
-        this.getRegistrationList();
+        // this.getRegistrationList();
     },
 }
 </script>
diff --git a/src/views/purchase/supCompanyAduditDialog.vue b/src/views/purchase/supCompanyAduditDialog.vue
index 0519b3d..d3c6ac0 100644
--- a/src/views/purchase/supCompanyAduditDialog.vue
+++ b/src/views/purchase/supCompanyAduditDialog.vue
@@ -142,6 +142,11 @@
                     <el-table-column label="有效期" prop="vailDate"></el-table-column>
                     <el-table-column label="失效期" prop="expireDate"></el-table-column>
                     <el-table-column label="备注" prop="remark"></el-table-column>
+                    <el-table-column label="证书状态" prop="status">
+                    <template slot-scope="scope">
+                                {{ supStatus[scope.row.status] }}
+                        </template>
+                    </el-table-column>
                     <el-table-column label="审核状态" prop="auditStatus" width="120">
                         <template slot-scope="scope">
                             <el-tag :type="(scope.row.auditStatus) | statusFilterType">
@@ -355,6 +360,10 @@ export default {
                 3: "变更未审核",
                 6: "未审核",
             },
+            supStatus: {
+                0: "有效",
+                1: "失效",
+            },
             certAuditVisible: false,
             currentAudit: {},
         };
diff --git a/src/views/purchase/supManufacturerEditDialog.vue b/src/views/purchase/supManufacturerEditDialog.vue
index 629ae0d..e6e6054 100644
--- a/src/views/purchase/supManufacturerEditDialog.vue
+++ b/src/views/purchase/supManufacturerEditDialog.vue
@@ -15,7 +15,7 @@
                         size="mini"
                         icon="search"
                         v-if="inputQuery.auditStatus == 0"
-                        @click="onModifySubmit(0)"
+                        @click="addOrModifyCompany(0)"
                     >草稿保存
                     </el-button
                     >
@@ -219,6 +219,13 @@
                             </el-tag>
                         </template>
                     </el-table-column>
+                    <el-table-column label="状态" prop="status" width="120">
+                        <template slot-scope="scope">
+                            <el-tag :type="(scope.row.status) | statusType">
+                                {{ statusFlag[scope.row.status] }}
+                            </el-tag>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="备注" prop="remark"></el-table-column>
                     <el-table-column label="操作" fixed="right" width="250">
                         <template slot-scope="scope">
@@ -226,7 +233,6 @@
                                 type="text"
                                 size="small"
                                 @click.native="addCert(scope.row)"
-                                v-if="scope.row.auditStatus == 0 || scope.row.auditStatus == 2|| scope.row.auditStatus == 6"
                             >编辑
                             </el-button
                             >
@@ -247,7 +253,7 @@
                             </el-button
                             >
 
-                            <el-button
+                            <!-- <el-button
                                 type="text"
                                 size="small"
                                 v-if=" scope.row.auditStatus == 1 && scope.row.status==0"
@@ -263,7 +269,7 @@
                                 @click.native="disableCert(scope.row,0)"
                             >启用
                             </el-button
-                            >
+                            > -->
                         </template>
                     </el-table-column>
                 </el-table>
@@ -332,6 +338,7 @@ import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
 import {getSupComapnys} from "@/api/purchase/supCompany";
 import {getUUID} from "@/utils/strUtil";
 import supCertSetSelectDialog from "@/views/purchase/supCertSetSelectDialog";
+import {getCompany} from "@/api/inout/company";
 
 export default {
     name: "supManufacturerEdit",
@@ -359,7 +366,7 @@ export default {
             classesDisplay: false,
             selectedOptions: [],
             selectedOptions2: [],
-            options: regionDataPlus,
+            options: regionData,
             rules: {
 
                 customerId: [
@@ -468,6 +475,10 @@ export default {
                 1: "新增生产企业资质证书",
                 2: "编辑生产企业资质证书",
             },
+            formMap: {
+                1: "新增生产企业资质证书",
+                2: "编辑生产企业资质证书",
+            },
             manufacturerId: null,
             customerId: null,
             selectCertVisible: false,
@@ -475,15 +486,14 @@ export default {
         };
     },
     created() {
-
-        console.log(this.fromType + "----------------------");
-
         if (this.editType == 0) {
             this.inputQuery.manufacturerId = getUUID("")
         } else {
             this.certQuery.customerId = this.inputQuery.customerId;
             this.selectedOptions = this.inputQuery.placeAreaCode.split(",");
-            this.selectedOptions2 = this.inputQuery.productionAreaCode.split(",");
+            if(this.inputQuery.productionAreaCode!="" && this.inputQuery.productionAreaCode!=null && this.inputQuery.productionAreaCode!=undefined){
+                this.selectedOptions2 = this.inputQuery.productionAreaCode.split(",");
+            }
 
         }
         this.certQuery.manufacturerIdFk = this.inputQuery.manufacturerId;
@@ -502,30 +512,46 @@ export default {
     },
     methods: {
         onModifySubmit(type) {
-
-            this.$refs["inputQuery"].validate(valid => {
-                if (valid) {
-
-                    let formData = JSON.parse(JSON.stringify(this.inputQuery));
-                    formData.auditStatus = type;
-
-                    this.loading = true;
-                    let urlName = this.editType == 0 ? 'add' : 'update';
-                    addOrModifyCompany(formData, urlName).then(response => {
-                        this.loading = false;
-                        if (response.code === 20000) {
-                            this.addCloseDialog(true);
-                            this.$message.success("保存成功");
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                    });
-                } else {
-                    console.log("error submit!!");
-                    return false;
+          
+          //判断本企业产品是否是通过审核的
+              let query = {
+                customerId: this.$store.getters.customerId
                 }
-            });
-        },
+              getCompany(query)
+               .then((response) => {
+                 if(response.data.auditStatus!=1){
+                  this.$message.error("本企业信息还未通过审核!");
+                  falg=false;
+                  return;
+                 }else{
+                  this.addOrModifyCompany(type);
+                 }}).catch(() => {
+
+                 });
+      },
+      addOrModifyCompany (type){
+          this.$refs["inputQuery"].validate(valid => {
+                   if (valid) {
+
+                  let formData = JSON.parse(JSON.stringify(this.inputQuery));
+                  formData.auditStatus = type;
+                  this.loading = true;
+                  let urlName = this.editType == 0 ? 'add' : 'update';
+                  addOrModifyCompany(formData, urlName).then(response => {
+                      this.loading = false;
+                      if (response.code === 20000) {
+                          this.addCloseDialog(true);
+                          this.$message.success("保存成功");
+                      } else {
+                          this.$message.error(response.message);
+                      }
+                  });
+              } else {
+                  console.log("error submit!!");
+                  return false;
+              }
+          });
+      },
         certHandleCurrentChange(val) {
             this.certQuery.page = val;
             this.getCompanyCertList();
diff --git a/src/views/purchase/supProductEditDialog.vue b/src/views/purchase/supProductEditDialog.vue
index 4d848e2..09fad46 100644
--- a/src/views/purchase/supProductEditDialog.vue
+++ b/src/views/purchase/supProductEditDialog.vue
@@ -265,6 +265,13 @@
                         </el-tag>
                     </template>
                 </el-table-column>
+                <el-table-column label="状态" prop="status" width="120">
+                        <template slot-scope="scope">
+                            <el-tag :type="(scope.row.status) | statusType">
+                                {{ statusFlag[scope.row.status] }}
+                            </el-tag>
+                        </template>
+                    </el-table-column>
                 <el-table-column label="备注" prop="remark"></el-table-column>
                 <el-table-column label="操作" fixed="right" width="250">
                     <template slot-scope="scope">
@@ -286,10 +293,18 @@
                         <el-button
                             type="text"
                             size="small"
+                            :disabled="scope.row.auditStatus === 1"
                             @click.native="deleteCompanyCert(scope.row)"
                         >删除
                         </el-button
                         >
+                        <el-button
+                            type="text"
+                            size="small"
+                            v-if="scope.row.auditStatus === 2"
+                            @click.native.stop="rejectInfo(scope.row)"
+                        >说明
+                        </el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -505,7 +520,10 @@ export default {
                 6: "未审核",
             },
             editTye: 1,
-
+            statusFlag: {
+                0: "有效",
+                1: "失效",
+            },
             manufacturerId: null,
             productId: null,
             customerId: null,
@@ -565,7 +583,16 @@ export default {
         toViewCompanyCert(row) {
             window.open(this.certFileUrl + row.filePath);
         },
+        rejectInfo(row) {
+            this.$confirm(row.auditComment, "拒绝说明", {
+                confirmButtonText: "确定",
+                type: "warning",
+                showCancelButton: false,
+            })
+                .then(() => {
+                });
 
+        },
         findMethod(query) {
             this.fromOptions = [];
             let cQuery = {
diff --git a/src/views/thrsys/ThrOrdedrReceiveAdd.vue b/src/views/thrsys/ThrOrdedrReceiveAdd.vue
index 644c6d7..972a6b2 100644
--- a/src/views/thrsys/ThrOrdedrReceiveAdd.vue
+++ b/src/views/thrsys/ThrOrdedrReceiveAdd.vue
@@ -68,9 +68,10 @@
             <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true"
                       @current-change="handleDetail">
                 <el-table-column label="序号" type="index" width="60"></el-table-column>
-                <el-table-column label="领用类型" prop="billTypeName"></el-table-column>
+                <el-table-column label="单据类型" prop="billTypeName"></el-table-column>
                 <el-table-column label="单据号" prop="billNo"></el-table-column>
-                <el-table-column label="往来信息" prop="corpName"
+                <el-table-column label="领用分库" prop="invWarehouseName"></el-table-column>
+                <el-table-column label="往来信息" prop="fromSubInvName"
                                  show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="单据日期" prop="billdate"></el-table-column>
                 <el-table-column label="操作" fixed="right">
diff --git a/src/views/thrsys/ThrOrdedrReceiveSearch.vue b/src/views/thrsys/ThrOrdedrReceiveSearch.vue
index 7e648df..f881439 100644
--- a/src/views/thrsys/ThrOrdedrReceiveSearch.vue
+++ b/src/views/thrsys/ThrOrdedrReceiveSearch.vue
@@ -60,7 +60,7 @@
             <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true"
                       @current-change="handleDetail">
                 <el-table-column label="序号" type="index" width="60"></el-table-column>
-                <el-table-column label="第三方单据类型" prop="billTypeName"></el-table-column>
+                <el-table-column label="单据类型" prop="billTypeName"></el-table-column>
                 <el-table-column label="单据号" prop="billNo"></el-table-column>
                 <el-table-column label="往来信息" prop="corpName"
                                  show-overflow-tooltip="true"></el-table-column>
diff --git a/src/views/thrsys/thrOrderNew.vue b/src/views/thrsys/thrOrderNew.vue
index ed0a823..7a9c134 100644
--- a/src/views/thrsys/thrOrderNew.vue
+++ b/src/views/thrsys/thrOrderNew.vue
@@ -471,7 +471,7 @@ export default {
 
                     }
 
-                    if (status === '0') {
+                    if (status === '2') {
                         for (let i = 0; i < this.codeArray.length; i++) {
                             if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
                                 return this.$message.error('单据数量不能为0');