同步自助平台代码

src/views/business/stockOrderNewDistribution.vue

@@ -1214,6 +1214,7 @@ export default {
         //         });
         // },
         getBusType() {
+            this.formData.billType=null;
             let query = {
                 code: this.formData.invWarehouseCode,
                 enabled: true,
@@ -1376,7 +1377,9 @@ export default {
             // this.generateBillNo();
         }
         this.findMethod();
+        if(this.formData.invWarehouseCode!=null){
         this.getBusType();
+       }
         this.getStorage();
         this.findSubInvByInv();
         this.findSubStorageMethod();

src/views/business/stockOrderNewSelectProduct.vue

@@ -76,7 +76,7 @@
                         show-overflow-tooltip
                     ></el-table-column>
                     <el-table-column
-                        label="生产企业"
+                        label="医疗器械注册人"
                         prop="ylqxzcrbarmc"
                         show-overflow-tooltip
                     ></el-table-column>
@@ -188,6 +188,7 @@ export default {
                 erpName: "",
                 keys: [],
             },
+            ids:[],
             radioCheck: null,
             dataList: [],
             pageTotal: 1,
@@ -243,20 +244,12 @@ export default {
             this.$router.push({
                 path: "",
             });
-            this.listQuery = {
+            this.listQuery.udiCode=null
-                unionCode: null,
+            this.listQuery.unionCode=null
-                udiCode: null,
+            this.listQuery.cpmctymc=null
-                ylqxzcrbarmc: "",
+            this.listQuery.ggxh=null
-                cpmctymc: "",
+            this.listQuery.ylqxzcrbarmc=null
-                thrPiId: null,
+            this.listQuery.thrPiId=null
-                nameCode: "",
-                ggxh: null,
-                page: 1,
-                limit: 20,
-                addType: 1,
-                billType: this.data.formData.billType,
-                corpId: this.data.formData.corpId,
-            };
             this.getList();
         },
         tableRowClassName({row}) {
@@ -347,6 +340,15 @@ export default {
                 this.$message.error('未选择产品');
                 return;
             }
+            
+            if(this.ids.length>0){
+                for(var i=0;i<this.ids.length;i++){
+                   if(this.ids[i]==this.multipleSelection.rlId){
+                    this.$message.error("该产品已录入！");
+                    return
+                   }
+                }
+            }
             let str = this.multipleSelection.zczbhhzbapzbh;
             if (str.search(",") != -1) {
                 this.currentCert = null;
@@ -391,26 +393,34 @@ export default {
         selectCert() {
             if (this.currentCert == null) {
                 this.$message.error("请先选择对应的注册证！");
+            }else{
+               this.multipleSelection.zczbhhzbapzbh = this.currentCert;
+               this.combine();
             }
-            this.multipleSelection.zczbhhzbapzbh = this.currentCert;
+           
-            this.combine();
         },
     },
     components: {udiRlDetailDialog},
 
     created() {
         if (this.$isNotBlank(this.data)) {
-            this.listQuery.nameCode = this.data.udi;
+            // this.listQuery.nameCode = this.data.udi;
-            if (this.data.billType != null) {
+            // if (this.data.billType != null) {
-                this.listQuery.billType = this.data.billType;
+            //     this.listQuery.billType = this.data.billType;
-            } else
+            // } else
-                this.listQuery.billType = this.data.formData.billType;
+            //     this.listQuery.billType = this.data.formData.billType;
 
-            if (this.data.formData != null) {
+            // if (this.data.formData != null) {
-                this.listQuery.corpId = this.data.formData.corpId;
+            //     this.listQuery.corpId = this.data.formData.corpId;
+            // }
+            // this.orderEditor = this.data.orderEditor;
+            // this.orderId = this.data.orderId;
+            this.ids=[];
+            if(this.data.stockOrderLists.length>0){
+                for(var i=0;i<this.data.stockOrderLists.length;i++){
+                    this.ids.push(this.data.stockOrderLists[i].productId);
+                }
             }
-            this.orderEditor = this.data.orderEditor;
-            this.orderId = this.data.orderId;
         }
         this.getList();
     },

src/views/inout/IOAddOrder.vue

@@ -918,6 +918,7 @@ export default {
             this.$router.go(-1);
         },
         getBusType() {
+            this.formData.billType=null;
             let query = {
                 code: this.formData.invWarehouseCode,
                 enabled: true,
@@ -1221,7 +1222,9 @@ export default {
         this.formData.code = '';
         this.formData.actDate = new Date();
         this.codeArray = [];
+        if(this.formData.invWarehouseCode!=null){
         this.getBusType();
+       }
         this.getStorage(this.formData.action);
 
         if (this.$isNotBlank(this.idQuery.id)) {

src/views/purchase/purApplyEditDiaolog.vue

@@ -284,6 +284,18 @@ export default {
                         return;
                     }
                     if (status === '2') {
+
+                        if(this.formData.billDate=="" || this.formData.billDate==null){
+                            return this.$message.error("单据日期不能为空！");
+                        }
+                        if(this.formData.locStorageCode=="" || this.formData.locStorageCode==null){
+                            return this.$message.error("仓库不能为空！");
+                        }
+                        if(this.formData.invWarehouseCode=="" || this.formData.invWarehouseCode==null){
+                            return this.$message.error("分库不能为空！");
+                        }
+
+
                         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');

src/views/purchase/purPlan.vue

@@ -245,7 +245,6 @@ export default {
             listApplyDetail(query) //查找该单号下的所有条码
                 .then((response) => {
                     this.detailList = response.data.list || [];
-                    this.total = response.data.total || 0;
                     this.loading = false;
                 })
                 .catch(() => {

src/views/purchase/purPlanDetailDialog.vue

@@ -114,7 +114,7 @@
             </el-card>
 
             <el-card>
-                <el-button-group style="display: flex">
+                <!-- <el-button-group style="display: flex">
                     <el-button
                         type="primary"
                         size="small"
@@ -124,7 +124,7 @@
                     >产品录入
                     </el-button
                     >
-                </el-button-group>
+                </el-button-group> -->
 
                 <el-table v-loading="loading" :data="codeArray" style="width: 100%;"
                           :row-class-name="tableRowClassName"
@@ -162,7 +162,7 @@
                         </template>
                     </el-table-column>
 
-                    <el-table-column label="操作" fixed="right" width="150">
+                    <!-- <el-table-column label="操作" fixed="right" width="150">
                         <template slot-scope="scope">
                             <el-button
                                 type="text"
@@ -182,7 +182,7 @@
                             </el-button
                             >
                         </template>
-                    </el-table-column>
+                    </el-table-column> -->
                 </el-table>
             </el-card>
         </el-form>

src/views/purchase/purPlanEditDialog.vue

@@ -310,6 +310,18 @@ export default {
                         return;
                     }
                     if (status === '2') {
+                        if(this.formData.billDate=="" || this.formData.billDate==null){
+                            return this.$message.error("单据日期不能为空！");
+                        }
+                        if(this.formData.billType=="" || this.formData.billType==null){
+                            return this.$message.error("采购类型不能为空！");
+                        }
+                        if(this.formData.locStorageCode=="" || this.formData.locStorageCode==null){
+                            return this.$message.error("采购仓库不能为空！");
+                        }
+                        if(this.formData.invWarehouseCode=="" || this.formData.invWarehouseCode==null){
+                            return this.$message.error("采购分库不能为空！");
+                        }
                         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');

src/views/purchase/purPlanSearch.vue

@@ -242,7 +242,6 @@ export default {
             listApplyDetail(query) //查找该单号下的所有条码
                 .then((response) => {
                     this.detailList = response.data.list || [];
-                    this.total = response.data.total || 0;
                     this.loading = false;
                 })
                 .catch(() => {

src/views/purchase/pureApplyAudit.vue

@@ -252,7 +252,6 @@ export default {
             listApplyDetail(query) //查找该单号下的所有条码
                 .then((response) => {
                     this.detailList = response.data.list || [];
-                    this.total = response.data.total || 0;
                     this.loading = false;
                 })
                 .catch(() => {

src/views/purchase/pureApplyDetailDialog.vue

@@ -194,7 +194,7 @@
                     <el-table-column width="150" label="单据数量" prop="count">
                     </el-table-column>
 
-                    <el-table-column label="操作" fixed="right" width="150">
+                    <!-- <el-table-column label="操作" fixed="right" width="150">
                         <template slot-scope="scope">
                             <el-button
                                 type="text"
@@ -214,7 +214,7 @@
                             </el-button
                             >
                         </template>
-                    </el-table-column>
+                    </el-table-column> -->
                 </el-table>
             </el-card>
         </el-form>

src/views/purchase/pureApplySearch.vue

@@ -251,7 +251,6 @@ export default {
             listApplyDetail(query) //查找该单号下的所有条码
                 .then((response) => {
                     this.detailList = response.data.list || [];
-                    this.total = response.data.total || 0;
                     this.loading = false;
                 })
                 .catch(() => {

src/views/purchase/supCertAddDialog.vue

@@ -32,7 +32,7 @@
                         </div>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item prop="name">
+                        <el-form-item prop="code">
                             <el-input v-model="formData.code" auto-complete="off"
                                       :disabled="formData.auditStatus == 1"></el-input>
                         </el-form-item>
@@ -206,7 +206,10 @@ export default {
             },
             formRules: {
                 name: [
-                    {required: true, message: "电子档名称", trigger: "blur"}
+                {required: true, message: "请输入证书名称", trigger: "blur"}
+                ],
+                 code: [
+                {required: true, message: "请输入证书编号", trigger: "blur"}
                 ],
             },
             loading: false,

src/views/purchase/supCertSet.vue

@@ -160,10 +160,10 @@
                 </el-table-column>
             </el-table>
             <el-pagination
-                :page-size="query.limit"
+                :page-size="manufacturerQuery.limit"
-                @current-change="handleCurrentChange"
+                @current-change="handleManufacturerChange"
                 layout="prev, pager, next"
-                :total="total"
+                :total="manufacturerTotal"
             >
             </el-pagination>
             <el-dialog
@@ -252,7 +252,7 @@
             <div>
                 <p class="form-title">产品资质设置</p>
             </div>
-            <div style=" float: right;
+            <div style="float:right;
                         text-align: right;
                         margin-bottom: 8px;"
             >
@@ -305,10 +305,10 @@
                 </el-table-column>
             </el-table>
             <el-pagination
-                :page-size="query.limit"
+                :page-size="productQuery.limit"
-                @current-change="handleCurrentChange"
+                @current-change="handleProductChange"
                 layout="prev, pager, next"
-                :total="total"
+                :total="productTotal"
             >
             </el-pagination>
 
@@ -354,7 +354,7 @@
                     <el-row>
                         <el-col :span="3">
                             <div class="ao-text">
-                                <span>产品类型：</span>
+                                <span>器械类别：</span>
                             </div>
                         </el-col>
                         <el-col :span="8">
@@ -501,7 +501,7 @@ export default {
                     {required: true, message: "证书名称", trigger: "blur"}
                 ],
                 need: [
-                {required: true, message: "请选择是否禁用", trigger: "blur"}
+                {required: true, message: "请选择产地", trigger: "blur"}
                 ],
 
             },
@@ -537,9 +537,7 @@ export default {
                 name: [
                     {required: true, message: "请输入证书名称", trigger: "blur"}
                 ],
-                need: [
+               
-                    {required: true, message: "请选择是否必传", trigger: "blur"}
-                ],
             },
 
             /**--------产品资质设置--------------*/
@@ -618,7 +616,11 @@ export default {
                         this.currentSup.type = 1;
                         addSupCertSet(this.currentSup)
                             .then((response) => {
-                                this.getList();
+                                if(response.code==20000){
+                                    this.getList();
+                                }else{
+                                    this.$message.error(response.message);
+                                }
                             })
                             .catch(() => {
                             });
@@ -628,6 +630,7 @@ export default {
                                 this.getList();
                                 this.$message.success("保存成功！");
                             } else {
+                                this.getList();
                                 this.$message.error(res.message);
                             }
                         })
@@ -638,6 +641,9 @@ export default {
 
         },
         cancelDialog() {
+            this.getList();
+            this.getManufacturerList();
+            this.getProductList();
             this.addDialogVisible = false;
             this.addManufacturerDialogVisible = false;
             this.addProductDialogVisible = false;
@@ -645,6 +651,10 @@ export default {
 
 
         /**--------生产企业资质设置--------------*/
+        handleManufacturerChange(val) {
+            this.manufacturerQuery.page = val;
+            this.getManufacturerList();
+        },
         getManufacturerList() {
             this.manufacturerLoading = true;
             filterCertSet(this.manufacturerQuery)
@@ -690,7 +700,12 @@ export default {
                         this.currentManufacturer.type = 2;
                         addSupCertSet(this.currentManufacturer)
                             .then((response) => {
-                                this.getManufacturerList();
+                                if(response.code==20000){
+                                    this.getManufacturerList();
+                                  }else{
+                                      this.$message.error(response.message);
+                                }
+
                             })
                             .catch(() => {
                             });
@@ -700,6 +715,7 @@ export default {
                                 this.getManufacturerList();
                                 this.$message.success("保存成功！");
                             } else {
+                                this.getManufacturerList();
                                 this.$message.error(res.message);
                             }
                         })
@@ -711,6 +727,10 @@ export default {
 
 
         /**--------产品资质设置--------------*/
+        handleProductChange(val) {
+            this.productQuery.page = val;
+            this.getProductList();
+        },
         getProductList() {
             this.productLoading = true;
             filterCertSet(this.productQuery)
@@ -757,7 +777,11 @@ export default {
                         this.currentProduct.type = 3;
                         addSupCertSet(this.currentProduct)
                             .then((response) => {
-                                this.getProductList();
+                                if(response.code==20000){
+                                    this.getProductList();
+                                  }else{
+                                      this.$message.error(response.message);
+                                }
                             })
                             .catch(() => {
                             });
@@ -767,6 +791,7 @@ export default {
                                 this.getProductList();
                                 this.$message.success("保存成功！");
                             } else {
+                                this.getProductList();
                                 this.$message.error(res.message);
                             }
                         })

src/views/purchase/supCertSetSelectDialog.vue

@@ -33,7 +33,7 @@
                     </template>
                 </el-table-column>
 
-                <el-table-column label="产品类型" prop="cplx" v-if="certType == 3">
+                <el-table-column label="器械类别" prop="cplx" v-if="certType == 3">
                 </el-table-column>
                 <el-table-column label="产品类别" prop="hchzsb" v-if="certType == 3">
                 </el-table-column>

src/views/purchase/supCertificationAdd.vue

@@ -481,13 +481,15 @@ export default {
             if (this.$isNotBlank(row)) {
                 this.registrationId = row.id;
                 this.curProductQuery = row;
+                this.curProductQuery.cuStatus=this.currentManufacturer.auditStatus;
                 this.formName = "update";
                 this.editProductType = 1;
             } else {
                 this.editProductType = 0;
                 this.formName = "add";
                 this.curProductQuery = {
-                    auditStatus: 0
+                    auditStatus: 0,
+                    cuStatus:this.currentManufacturer.auditStatus
                 };
             }
             this.registrationVisible = true;

src/views/purchase/supCompanyAduditDialog.vue

@@ -505,6 +505,9 @@ export default {
             this.certLoading = true;
             this.certQuery.customerId = this.inputQuery.customerId;
             this.certQuery.type = 1;
+            if(this.editType==2){
+                this.certQuery.auditStatus=25;
+            }
             filterCompanyCert(this.certQuery)
                 .then((response) => {
                     this.certLoading = false;

src/views/purchase/supManufacturerAuditDialog.vue

@@ -197,6 +197,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">
@@ -404,6 +409,10 @@ export default {
                 3: "变更未审核",
                 6: "未审核",
             },
+            supStatus: {
+                0: "有效",
+                1: "失效",
+            },
             certAuditVisible: false,
             currentAudit: {},
         };
@@ -484,6 +493,9 @@ export default {
             this.getCompanyCertList();
         },
         getCompanyCertList() {
+            if(this.editType!=2 && this.editType!=0){
+                this.certQuery.auditStatus = 20;
+            }
             this.certLoading = true;
             this.certQuery.type = 2;
             filterCompanyCert(this.certQuery)

src/views/purchase/supManufacturerEditDialog.vue

@@ -521,7 +521,6 @@ export default {
                .then((response) => {
                  if(response.data.auditStatus!=1){
                   this.$message.error("本企业信息还未通过审核!");
-                  falg=false;
                   return;
                  }else{
                   this.addOrModifyCompany(type);
@@ -575,6 +574,7 @@ export default {
                 this.editTye = 2;
             } else {
                 this.formName = 1;
+                this.inputQuery.formData = {};
                 this.editTye = 1;
             }
             this.addCertVisible = true;

src/views/purchase/supProductAuditDialog.vue

@@ -211,6 +211,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">
@@ -423,7 +428,10 @@ export default {
                 3: "变更未审核",
                 6: "未审核",
             },
-
+            supStatus: {
+                0: "有效",
+                1: "失效",
+            },
             certAuditVisible: false,
             currentAudit: {},
         };
@@ -432,6 +440,9 @@ export default {
         if (this.editType == 0) {
             this.inputQuery.productId = getUUID("");
         } else {
+            if(this.editType!=2 && this.editType!=0){
+              this.certQuery.auditStatus = 20;
+           }
             this.getCompanyCertList();
             this.pmQuery.customerId = this.inputQuery.customerId;
             this.findPMMethod();

src/views/purchase/supProductEditDialog.vue

@@ -425,6 +425,7 @@ export default {
             },
             loading: false,
             classesDisplay: false,
+            cuStatus:0,
             selectedOptions: [],
             selectedOptions2: [],
             options: regionDataPlus,
@@ -544,6 +545,7 @@ export default {
             this.pmQuery.customerId = this.inputQuery.customerId;
 
         }
+        this.cuStatus=this.inputQuery.cuStatus;
         this.manufacturerId = this.inputQuery.manufacturerIdFk
         this.productId = this.inputQuery.productId
         this.findMethod();
@@ -556,7 +558,12 @@ export default {
     },
     methods: {
         onModifySubmit(val) {
-
+            if(val!=0){
+                if(this.cuStatus!=1){
+                this.$message.error("生产企业未通过审核不能提交！");
+                return;
+               }
+            }
             this.$refs['inputQuery'].validate(valid => {
                 if (valid) {
                     // this.inputQuery.auditStatus = val;