Merge remote-tracking branch 'origin/develop' into develop

src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue

@@ -26,7 +26,7 @@
               <el-form-item label="选择清单" prop="orgName" class="add-form-item form-item-disabled">
                 <el-radio-group v-model="listType" @change="selectionList">
                   <el-radio label="country">国家/地区清单</el-radio>
-                  <el-radio label="project">项目清单</el-radio>
+                  <el-radio label="project">车型类别清单</el-radio>
                   <el-radio label="other">其他清单</el-radio>
                 </el-radio-group>
                 <el-button size="mini" type="primary" style="margin-left: 40px;" @click="choiceShow">
@@ -377,7 +377,7 @@
                 align="center">
               </el-table-column>
               <el-table-column
-                prop="projectName"
+                prop="carType"
                 label="项目名称"
                 align="center">
               </el-table-column>
@@ -947,6 +947,20 @@ export default {
           _this: this
         }, res => {
           this.sarAccessListDatas = res.data.records;
+          this.sarAccessListDatas.forEach(item =>{
+            // 适用车型转换
+            if (item.carType !== null) {
+              let k = (item.carType || "").split(',')
+              for (let i in this.energyKindOptions) {
+                for (let m = 0; m< k.length; m++) {
+                  if (this.energyKindOptions[i].value === k[m]) {
+                    k[m]  = this.energyKindOptions[i].label
+                  }
+                  item.carType = k.join(',')
+                }
+              }
+            }
+          })
           this.total = res.data.total;
         }, e => {
         });
@@ -1384,6 +1398,7 @@ export default {
     this.$http.get("sys/dictype/getDicTypeListCode", {}, {
       _this: this
     }, res => {
+      this.energyKindOptions = res.data.ENERGYTYPES //适用车型
       this.countryOptions = res.data.COUNTRY;
       this.standStateOptions = res.data.WBZTCLASS; // 文本状态
       this.setMap(this.standStateOptions);

src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue

@@ -26,7 +26,7 @@
               <el-form-item label="选择清单" prop="orgName" class="add-form-item form-item-disabled">
                 <el-radio-group v-model="listType" @change="selectionList">
                   <el-radio label="country">国家/地区清单</el-radio>
-                  <el-radio label="project">项目清单</el-radio>
+                  <el-radio label="project">车型类别清单</el-radio>
                   <el-radio label="other">其他清单</el-radio>
                 </el-radio-group>
                 <el-button size="mini" type="primary" style="margin-left: 40px;" @click="choiceShow">
@@ -380,8 +380,8 @@
                 align="center">
               </el-table-column>
               <el-table-column
-                prop="projectName"
+                prop="carType"
-                label="项目名称"
+                label="车型类别"
                 align="center">
               </el-table-column>
               <el-table-column
@@ -913,6 +913,20 @@ export default {
           _this: this
         }, res => {
           this.sarAccessListDatas = res.data.records;
+          this.sarAccessListDatas.forEach(item =>{
+            // 适用车型转换
+            if (item.carType !== null) {
+              let k = (item.carType || "").split(',')
+              for (let i in this.energyKindOptions) {
+                for (let m = 0; m< k.length; m++) {
+                  if (this.energyKindOptions[i].value === k[m]) {
+                    k[m]  = this.energyKindOptions[i].label
+                  }
+                  item.carType = k.join(',')
+                }
+              }
+            }
+          })
           this.total = res.data.total;
         }, e => {
         });
@@ -1359,6 +1373,7 @@ export default {
     this.$http.get("sys/dictype/getDicTypeListCode", {}, {
       _this: this
     }, res => {
+      this.energyKindOptions = res.data.ENERGYTYPES //适用车型
       this.countryOptions = res.data.COUNTRY;
       this.standStateOptions = res.data.WBZTCLASS; // 文本状态
       this.setMap(this.standStateOptions);

src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue

@@ -30,7 +30,6 @@
                 <el-input
                   v-model="listForm.projectNumber"
                   placeholder="请输入项目编号"
-                  disabled
                   clearable
                 ></el-input>
               </el-form-item>
@@ -38,7 +37,6 @@
                 <el-input
                   v-model="listForm.projectName"
                   placeholder="请输入项目名称"
-                  disabled
                   clearable
                 ></el-input>
               </el-form-item>
@@ -68,8 +66,10 @@
             label="标准号"
           >
             <template slot-scope="scope">
-              <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+              <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort
-              <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
+                }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+              <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }}
+                {{ scope.row.standNumber }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -265,14 +265,12 @@
                   <el-input
                     v-model="projectSearch.projectNumber"
                     placeholder="请输入项目编号"
-                    disabled
                   ></el-input>
                 </el-form-item>
                 <el-form-item label="项目名称" class="search-item search-item-last">
                   <el-input
                     v-model="projectSearch.projectName"
                     placeholder="请输入项目名称"
-                    disabled
                   ></el-input>
                 </el-form-item>
                 <el-form-item class="search-item btn-box">
@@ -368,13 +366,13 @@ export default {
       active: "1",  //当前选中的type
       isSubmit: false,
       saveLoading: false,
-      commentText: '',
+      commentText: "",
       //表单的数据
       listForm: {
         projectNumber: "",  //项目编号
         projectName: "",  //项目名称
         dataList: [], //项目下的标准数据
-        breakdownList: [], //标准下的分解单数据
+        breakdownList: [] //标准下的分解单数据
       },
       dataList: [], //下面标准的数据
       breakdownList: [], //标准下的条款数据
@@ -461,8 +459,8 @@ export default {
         _this: this
       }, res => {
         this.ProjectDatas = res.data.Maintenance.records;
+        this.total = res.data.Maintenance.total
       });
-
     },
     //点击清空按钮事件
     clearSearch() {
@@ -514,7 +512,7 @@ export default {
         {
           _this: this
         }, res => {
-          this.listForm.breakdownList = res.data
+          this.listForm.breakdownList = res.data;
         });
     },
     //标准的多选框改变
@@ -528,79 +526,83 @@ export default {
 
     },
     // 点击查看
-    handlePreview (item) {
+    handlePreview(item) {
       let routeUrl = this.$router.resolve({
-        name: 'OtherStandardDetails',
+        name: "OtherStandardDetails",
         params: {
           id: item.standId,
-          pageType: 'INLAND_STAND'
+          pageType: "INLAND_STAND"
         }
-      })
+      });
-      window.open(routeUrl.href, '_blank')
+      window.open(routeUrl.href, "_blank");
     },
     pageSizeChange(pageSize) {
 
     },
     //流程保存事件
-    handleSave(){
+    handleSave() {
-      this.saveLoading = true
+      this.saveLoading = true;
-      let _formData = new FormData()
+      let _formData = new FormData();
-      _formData.append('id', this.bpnId || '')
+      _formData.append("id", this.bpnId || "");
-      _formData.append('createUser', this.$store.getters.userInfo.userId)
+      _formData.append("createUser", this.$store.getters.userInfo.userId);
-      _formData.append('createUserName', this.$store.getters.userInfo.userName)
+      _formData.append("createUserName", this.$store.getters.userInfo.userName);
-      _formData.append('prcType', '6')
+      _formData.append("prcType", "6");
-      _formData.append('json', JSON.stringify({
+      _formData.append("json", JSON.stringify({
         form: this.form,
         roleForm: this.roleForm,
         commentText: this.commentText
-      }))
+      }));
       saveTaskFirst(_formData).then(res => {
-        this.saveLoading = false
+        this.saveLoading = false;
-        this.$message.success('保存成功')
+        this.$message.success("保存成功");
-        this.bpnId = res.result
+        this.bpnId = res.result;
       }).catch(e => {
-        this.saveLoading = false
+        this.saveLoading = false;
-      })
+      });
     },
     //流程提交事件
-    handleSubmit(){
+    handleSubmit() {
-      this.listForm.commentText = this.commentText;
+      if (this.listForm.dataList.length < 1) {
-      var json = Object.assign(this.listForm, this.roleForm)
+        this.$message.warning("请选择带标准的项目");
-      json.prcCreateUser = this.$store.getters.userInfo.userId;
+      } else {
-      json.prcCreateUserName = this.$store.getters.userInfo.uName;
+        this.listForm.commentText = this.commentText;
-      json.standId = this.listForm.standId;
+        var json = Object.assign(this.listForm, this.roleForm);
-      this.$refs['listForm'].validate((valid) => {
+        json.prcCreateUser = this.$store.getters.userInfo.userId;
-        if (valid) {
+        json.prcCreateUserName = this.$store.getters.userInfo.uName;
-          this.$refs['roleForm'].validate((valid) => {
+        json.standId = this.listForm.standId;
-            if (valid) {
+        this.$refs["listForm"].validate((valid) => {
-              this.isSubmit = true
+          if (valid) {
-              this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
+            this.$refs["roleForm"].validate((valid) => {
-                _this: this
+              if (valid) {
-              }, res => {
+                this.isSubmit = true;
-                if (res.ok) {
+                this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
-                  this.$http.post("lawss/activiti/completeTask", {
+                  _this: this
-                    taskIds: res.data,
+                }, res => {
-                    userId: this.$store.getters.userInfo.userId,
+                  if (res.ok) {
-                    json: JSON.stringify(json)
+                    this.$http.post("lawss/activiti/completeTask", {
-                  }, {
+                      taskIds: res.data,
-                    _this: this
+                      userId: this.$store.getters.userInfo.userId,
-                  }, res => {
+                      json: JSON.stringify(json)
-                    if (res.success) {
+                    }, {
-                      this.$message.success(res.message);
+                      _this: this
-                      this.$router.push("/processCenter");
+                    }, res => {
-                    }
+                      if (res.success) {
-                    this.isSubmit = false
+                        this.$message.success(res.message);
-                  });
+                        this.$router.push("/processCenter");
-                }
+                      }
-              });
+                      this.isSubmit = false;
-            } else {
+                    });
-              return this.$message.warning("请完善人员信息");
+                  }
-            }
+                });
-          });
+              } else {
-        } else {
+                return this.$message.warning("请完善人员信息");
-          return this.$message.warning("请完善基础信息");
+              }
-        }
+            });
-      });
+          } else {
+            return this.$message.warning("请完善基础信息");
+          }
+        });
+      }
     },
     choiceZRR(type, title, id) {
       this.nodeList = [];

src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue

@@ -450,10 +450,10 @@ export default {
       }, {
         _this: this
       }, res => {
-        if(res.data === null){
+        if (res.data === null) {
-          this.ProjectDatas = ''
+          this.ProjectDatas = "";
-          this.total = 0
+          this.total = 0;
-        }else{
+        } else {
           this.ProjectDatas = res.data.Maintenance.records;
           this.total = res.data.Maintenance.total;
         }
@@ -491,7 +491,6 @@ export default {
       this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, {
         _this: this
       }, res => {
-        console.log(res.data.records);
         this.listForm.dataList = res.data.records;
         this.dataList = res.data.records;
         this.listForm.dataList.forEach(item => {
@@ -525,7 +524,7 @@ export default {
         {
           _this: this
         }, res => {
-            this.listForm.breakdownList = res.data;
+          this.listForm.breakdownList = res.data;
         });
     },
     //标准的多选框改变
@@ -564,43 +563,47 @@ export default {
     },
     //流程提交事件
     handleSubmit() {
-      this.listForm.commentText = this.commentText;
+      if (this.listForm.dataList.length < 1) {
-      var json = Object.assign(this.listForm, this.roleForm);
+        this.$message.warning("请选择带标准的项目");
-      json.prcCreateUser = this.$store.getters.userInfo.userId;
+      } else {
-      json.prcCreateUserName = this.$store.getters.userInfo.uName;
+        this.listForm.commentText = this.commentText;
-      json.standId = this.listForm.standId;
+        var json = Object.assign(this.listForm, this.roleForm);
-      this.$refs["listForm"].validate((valid) => {
+        json.prcCreateUser = this.$store.getters.userInfo.userId;
-        if (valid) {
+        json.prcCreateUserName = this.$store.getters.userInfo.uName;
-          this.$refs["roleForm"].validate((valid) => {
+        json.standId = this.listForm.standId;
-            if (valid) {
+        this.$refs["listForm"].validate((valid) => {
-              this.isSubmit = true;
+          if (valid) {
-              this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
+            this.$refs["roleForm"].validate((valid) => {
-                _this: this
+              if (valid) {
-              }, res => {
+                this.isSubmit = true;
-                if (res.ok) {
+                this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
-                  this.$http.post("lawss/activiti/completeTask", {
+                  _this: this
-                    taskIds: res.data,
+                }, res => {
-                    userId: this.$store.getters.userInfo.userId,
+                  if (res.ok) {
-                    json: JSON.stringify(json)
+                    this.$http.post("lawss/activiti/completeTask", {
-                  }, {
+                      taskIds: res.data,
-                    _this: this
+                      userId: this.$store.getters.userInfo.userId,
-                  }, res => {
+                      json: JSON.stringify(json)
-                    if (res.success) {
+                    }, {
-                      this.$message.success(res.message);
+                      _this: this
-                      this.$router.push("/processCenter");
+                    }, res => {
-                    }
+                      if (res.success) {
-                    this.isSubmit = false;
+                        this.$message.success(res.message);
-                  });
+                        this.$router.push("/processCenter");
-                }
+                      }
-              });
+                      this.isSubmit = false;
-            } else {
+                    });
-              return this.$message.warning("请完善人员信息");
+                  }
-            }
+                });
-          });
+              } else {
-        } else {
+                return this.$message.warning("请完善人员信息");
-          return this.$message.warning("请完善基础信息");
+              }
-        }
+            });
-      });
+          } else {
+            return this.$message.warning("请完善基础信息");
+          }
+        });
+      }
     },
     // 点击查看
     handlePreview(item) {

src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue

@@ -44,7 +44,8 @@
         </process-title>
         <div class="tableTitle">
           <div class="tableButton">
-            <el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发责任人</el-button>
+            <el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发责任人
+            </el-button>
           </div>
         </div>
         <el-table
@@ -99,11 +100,11 @@
               <el-input v-model="scope.row.workPeople" placeholder="请选择分发责任人"
                         @click.native="choiceZRRS(scope.row, 1, scope.$index)" />
             </template>
-<!--            <template slot-scope="scope">-->
+            <!--            <template slot-scope="scope">-->
-<!--              <div :class="{'fileClass': !scope.row.workPeople}">-->
+            <!--              <div :class="{'fileClass': !scope.row.workPeople}">-->
-<!--                {{ scope.row.workPeople ? scope.row.workPeople : "" }}-->
+            <!--                {{ scope.row.workPeople ? scope.row.workPeople : "" }}-->
-<!--              </div>-->
+            <!--              </div>-->
-<!--            </template>-->
+            <!--            </template>-->
           </el-table-column>
         </el-table>
       </div>
@@ -259,7 +260,7 @@ export default {
       userId: this.$store.getters.userInfo.userId,
       taskIds: this.$route.query.taskIds,
       pId: this.$route.query.prcId,
-      selectedId:'',
+      selectedId: ""
     };
   },
   methods: {
@@ -322,6 +323,7 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
+          console.log(res.mesg);
           if (res) {
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);
@@ -413,9 +415,9 @@ export default {
       }, e => {
       });
     },
-     //批量分发按钮
+    //批量分发按钮
     choiceZRRS(row, type, index) {
-      this.selectedId=row.id
+      this.selectedId = row.id;
       this.type = type;
       if (type === 1) {
         this.drawerTitle = "选择责任人";
@@ -458,36 +460,37 @@ export default {
       //单选操作
       if (this.type === 1) {
         this.dataList.forEach(item => {
-          if(item.children){
+          if (item.children) {
             item.children.forEach(items => {
-             if(items.id === this.selectedId){
+              if (items.id === this.selectedId) {
-               items.workPeople = data[0].name
+                items.workPeople = data[0].name;
-               items.workPeopleId = data[0].id
+                items.workPeopleId = data[0].id;
-               // this.$set(items,'workPeople',data[0].name)
+                // this.$set(items,'workPeople',data[0].name)
-               //this.$set(items,'workPeopleId',data[0].id)
+                //this.$set(items,'workPeopleId',data[0].id)
-             }
+              }
-            })
+            });
           }
-        })
+        });
-        this.dataList = JSON.parse(JSON.stringify(this.dataList))
+        this.dataList = JSON.parse(JSON.stringify(this.dataList));
       } else if (this.type === 2) {
-        this.selectList.forEach(item =>{
+        this.selectList.forEach(item => {
-          this.dataList.map(items=>{
+          this.dataList.map(items => {
-            if(item.id==items.id){
+            if (item.id == items.id) {
-              items.workPeople = data[0].name
+              items.workPeople = "";
-              items.workPeopleId = data[0].id
+              items.workPeopleId = "";
+              this.$message.warning('您只能针对条款进行分发')
             }
-            if(items.children.length){
+            if (items.children.length) {
-              items.children.map(childrenItem=>{
+              items.children.map(childrenItem => {
-                if(childrenItem.id==item.id){
+                if (childrenItem.id == item.id) {
-                  childrenItem.workPeople = data[0].name
+                  childrenItem.workPeople = data[0].name;
-                  childrenItem.workPeopleId = data[0].id
+                  childrenItem.workPeopleId = data[0].id;
                 }
-              })
+              });
             }
-          })
+          });
-        })
+        });
-        this.dataList = JSON.parse(JSON.stringify(this.dataList))
+        this.dataList = JSON.parse(JSON.stringify(this.dataList));
       }
       this.modalshowflag = false;
     },

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue

@@ -188,7 +188,7 @@
                   <el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form">
                     <el-form-item label="车型类别" class="search-item search-item-last">
                       <el-input
-                        v-model="sarSarAccessEOSearch.projectName"
+                        v-model="sarSarAccessEOSearch.carType"
                         placeholder="请输入车型类别"
                       ></el-input>
                     </el-form-item>
@@ -236,7 +236,7 @@
                 align="center">
               </el-table-column>
               <el-table-column
-                prop="projectName"
+                prop="carType"
                 label="车型类别"
                 align="center">
               </el-table-column>
@@ -497,7 +497,7 @@ export default {
       localProLib: {},
       // 查询相关参数
       sarSarAccessEOSearch: {
-        projectName: "",
+        carType: "",
         detailedListName: "",
       },
       takeingFlag: false,
@@ -525,7 +525,7 @@ export default {
       this.getStand()
     },
     clearSearchAccess(){
-      this.sarSarAccessEOSearch.projectName = ''
+      this.sarSarAccessEOSearch.carType = ''
       this.sarSarAccessEOSearch.detailedListName = ''
       this.transfer()
     },
@@ -593,6 +593,20 @@ export default {
         _this: this
       }, res => {
         this.sarAccessListDatas = res.data.records;
+        this.sarAccessListDatas.forEach(item =>{
+          // 适用车型转换
+          if (item.carType !== null) {
+            let k = (item.carType || "").split(',')
+            for (let i in this.energyKindOptions) {
+              for (let m = 0; m< k.length; m++) {
+                if (this.energyKindOptions[i].value === k[m]) {
+                  k[m]  = this.energyKindOptions[i].label
+                }
+                item.carType = k.join(',')
+              }
+            }
+          }
+        })
         this.sarSarAccessEOSearch.page = 1
         this.totalNo = res.data.total
         this.detailedListModel = true
@@ -937,6 +951,7 @@ export default {
         _this: this,
         loading: 'loading'
       }, res => {
+        this.energyKindOptions = res.data.ENERGYTYPES //适用车型
         this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
         this.setMap(this.zrbmMap, res.data.ZRBMCLASS)
         this.setMap(this.textStatusMap, res.data.WBZTCLASS)

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue

@@ -129,7 +129,7 @@
                     class="common-button-primary"
                     size="mini"
                     v-btn-permission="'f0ea68cb2c01cd0063ea639ee9bd4cec'"
-                    @click="querySarProStateZero">查询
+                    @click="querySarProStateZero(1)">查询
                   </el-button>
                 </el-form-item>
                 <el-form-item class="search-item btn-box">

src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue

@@ -176,17 +176,17 @@
               label="责任部门">
             </el-table-column>
             <el-table-column
-              prop="dutyEngineerName"
+              prop="dutyEngineer"
               width="150"
               label="责任工程师">
             </el-table-column>
             <el-table-column
-              prop="authEngineerName"
+              prop="authEngineer"
               width="150"
               label="认证工程师">
             </el-table-column>
             <el-table-column
-              prop="qaEngineerName"
+              prop="qaEngineer"
               width="150"
               label="质量工程师">
             </el-table-column>
@@ -459,6 +459,7 @@ export default {
       }, res => {
         this.myLoading.loadData = false
         this.total = res.data.total
+        this.pageNo = 1
         this.nonList = res.data.records
         this.nonList.forEach(item => {
           // 责任部门转换