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

src/pages/home2/components/todoList/index.vue

@@ -637,9 +637,9 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if(row.taskInfo === '产品工程经理汇总清单'){
+          }else if(row.taskInfo === '标准法规部经理审批'){
             this.$router.push({
-              name: 'xmqdqrStep4',
+              name: 'xmqdqrStep5',
               query: {
                 taskIds: row.taskIds,
                 prcId: row.prcId,

src/pages/processCenter/pages/creatProcess/xmqdqr/step1-3.vue

@@ -80,7 +80,7 @@
             prop="standName"
             align="center"
             label="中文名称"
-            width="180px"
+            min-width="300"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -90,7 +90,7 @@
             prop="standEnName"
             label="英文名称"
             align="center"
-            width="180px"
+            min-width="300"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
@@ -133,30 +133,16 @@
           >
           </el-table-column>
           <el-table-column
-            show-overflow-tooltip
+            prop="involve"
-            prop="kccvppsbm"
+            width="160px"
-            width="180px"
             align="center"
-            label="卡车VPPS编码">
+            label="标准是否涉及">
           </el-table-column>
           <el-table-column
-            show-overflow-tooltip
+            prop="remarks"
-            prop="kccvppscn"
-            width="180px"
             align="center"
-            label="卡车vpps中文名称">
+            width="180"
-          </el-table-column>
+            label="备注">
-          <el-table-column
-            prop="cycvppsbm"
-            width="180px"
-            align="center"
-            label="乘用车VPPS编码">
-          </el-table-column>
-          <el-table-column
-            prop="cycvppscn"
-            width="180px"
-            align="center"
-            label="乘用车vpps中文名称">
           </el-table-column>
         </el-table>
       </div>
@@ -356,8 +342,13 @@ export default {
           this.qdform.prcName = this.prcName;
           this.qdform["id"] = item.id;
           this.dataList = item.dataList
-          this.projectId = item.projectId
+          this.dataList.forEach(item => {
-          // this.getStandData();
+            if(item.involve === 'involve'){
+              item.involve = '涉及'
+            }else if(item.involve === 'noInvolve'){
+              item.involve = '不涉及'
+            }
+          })
         }else{
           this.qdform = item.form
           this.dataList =item.form.dataList

src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue

@@ -93,8 +93,8 @@
           <el-table-column
             prop="standName"
             align="center"
+            min-width="300"
             label="中文名称"
-            width="180px"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -103,8 +103,8 @@
           <el-table-column
             prop="standEnName"
             label="英文名称"
+            min-width="300"
             align="center"
-            width="180px"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>

src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue

@@ -86,7 +86,7 @@
             prop="standName"
             align="center"
             label="中文名称"
-            width="180px"
+            min-width="300"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -96,7 +96,7 @@
             prop="standEnName"
             label="英文名称"
             align="center"
-            width="180px"
+            min-width="300"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>

src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue

@@ -86,7 +86,7 @@
             prop="standName"
             align="center"
             label="中文名称"
-            width="180px"
+            min-width="300"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -96,7 +96,7 @@
             prop="standEnName"
             label="英文名称"
             align="center"
-            width="180px"
+            min-width="300"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>

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

@@ -2,7 +2,7 @@
   <div class="xmqdqr-step2">
     <ProcessHeader toggle>
       <template slot="proName">项目清单确认流程</template>
-      <template slot="proNode">法规部经理审批</template>
+      <template slot="proNode">产品经理汇总</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -54,7 +54,7 @@
           :data="dataList"
           border
           ref="selection"
-          height="65%"
+          height="63%"
           @selection-change="selectStandChange"
           style="width: 100%; border:1px solid #ccc"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
@@ -80,7 +80,7 @@
             prop="standName"
             align="center"
             label="中文名称"
-            width="180px"
+            min-width="300"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -90,7 +90,7 @@
             prop="standEnName"
             label="英文名称"
             align="center"
-            width="180px"
+            min-width="300"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
@@ -107,22 +107,22 @@
             </template>
           </el-table-column>
           <el-table-column
-            prop="xcxssrq"
+            prop="xcxssrqgj"
             width="190px"
             align="center"
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="zccssrq"
+            prop="zccssrqgj"
             align="center"
             sortable
             width="190px"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -132,11 +132,24 @@
             width="180px"
           >
           </el-table-column>
+          <el-table-column
+            prop="involve"
+            width="160px"
+            align="center"
+            label="标准是否涉及">
+          </el-table-column>
+          <el-table-column
+            prop="remarks"
+            align="center"
+            width="180"
+            label="备注">
+          </el-table-column>
+
         </el-table>
       </div>
       <div>
         <el-collapse accordion>
-          <el-collapse-item title="审批意见">
+          <el-collapse-item title="回执说明">
             <div style="margin: 10px 0;">
               <el-input
                 type="textarea"
@@ -245,7 +258,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { changeAssigneeNew, inboundLiaisonDetail, queryDetail } from "api/process";
+import { inboundLiaisonDetail, queryDetail, saveTaskForPub ,changeAssigneeNew, execTask} from "api/process";
 
 export default {
   name: "xmqdqrStep5",
@@ -256,23 +269,30 @@ export default {
   },
   data() {
     return {
+      lawInfoTableLoading: true,
+      lawInfoTable:[],
+      isTransfer: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
+      drawerTitle:'',
       active: "1",
+      nodeList: [],
+      nodeList2: [],
       loading: false,
       // 当前流程类型(1待办/2已办)
       processType: 1,
-      nodeList: [],
-      drawerTitle: '',
-      // 调整处理人抽屉状态
-      drawerModal: false,
       isSubmit: false,
-      isTransfer: false,
       saveLoading: false,
+      submitShow: false,
+      acceptShow: false,
+      todoId: '',
       projectId: "",
       detailedId: "",
       standSortOptions: [],
       standList: [],
       projectStand:[],
       standardData: [],
+      handleSelectTableList: [], //标准数据
       page: 1,
       pageSize: this.$store.getters.userInfo.configContent,
       total: 0,
@@ -299,10 +319,34 @@ export default {
       taskIds: this.$route.query.taskIds,
       pId: this.$route.query.prcId,
       standMap: new Map(),
-      textStatusMap: {}// 文本状态id与name对应
+      textStatusMap: {},// 文本状态id与name对应
     };
   },
+  mounted() {
+    this.processTable();
+    this.getData();
+    // 查询各下拉框数据
+    this.$http.get("sys/dictype/getDicTypeListCode", {}, {
+      _this: this,
+      loading: "loading"
+    }, res => {
+      this.energyKindOptions = res.data.ENERGYTYPES; //适用车型
+      this.standSortOptions = res.data.STANDCLASSIFY; // 标准类别
+      this.setMap(res.data.WBZTCLASS);// 文本状态
+      this.setMap(this.zrbmMap, res.data.ZRBMCLASS);
+      this.showLocalProductData(this.getLocalPro);
+    }, e => {
+    });
+  },
   methods: {
+    formatIssueDate(str) {
+      const momentDate = this.$moment(str)
+      if (momentDate.isValid()) {
+        return this.$moment(str).format('YYYY-MM-DD')
+      } else {
+        return str
+      }
+    },
     //确认转办
     checkedTransferRole (data) {
       this.assigneeNewLoading = true
@@ -324,7 +368,7 @@ export default {
       })
     },
     // 请求转换流程图
-    processNum () {
+    processNum (row) {
       axios.request({
         url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
         responseType: 'blob',
@@ -338,6 +382,18 @@ export default {
         this.processStep = window.URL.createObjectURL(res.data)
       })
     },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
+    // 将文本状态的id与name对应
+    setMap(data) {
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label)
+      })
+    },
     processTable() {
       this.$http.get("lawss/activiti/get_list_by_instance", {
         prcNum: this.$route.query.prcNum,
@@ -375,6 +431,15 @@ export default {
         }).then(res => {
           if (res) {
             const processForm = JSON.parse(res.mesg);
+            let commitStatus = res.commitStatus
+            if(commitStatus && commitStatus > 0){
+              this.acceptShow = true
+              this.submitShow = false
+            }else {
+              this.acceptShow = false
+              this.submitShow = true
+            }
+            this.todoId = res.id
             this.getFormFieldList(processForm);
           }
         }).catch(e => {
@@ -388,45 +453,92 @@ export default {
           this.qdform = JSON.parse(JSON.stringify(item));
           this.qdform.prcNum = this.prcNum;
           this.qdform.prcName = this.prcName;
-          this.dataList = item.dataList
           this.qdform["id"] = item.id;
-          this.projectId = item.projectId
+          this.dataList = item.dataList
+          this.dataList.forEach(item => {
+            if(item.involve === 'involve'){
+              item.involve = '涉及'
+            }else if(item.involve === 'noInvolve'){
+              item.involve = '不涉及'
+            }
+          })
+          // this.projectId = item.projectId;
+          // //获取清单id 查询对应清单下的标准
+          // this.detailedId = item.detailedListId;
           // this.getStandData();
         }else{
           this.qdform = item.form
           this.dataList =item.form.dataList
-          this.projectId = item.form.projectId
+          this.detailedId = item.form.detailedListId;
-          // this.getStandData();
         }
       });
     },
-    //提交事件
+    //查询清单下的标准
-    handleSubmit() {
+    getStandData() {
-      this.isSubmit = true;
+      this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId, cars: '1', }, {
-      this.qdform.passFlag = "0";
-      this.qdform.commentText = this.commentText;
-      this.qdform.dataList = this.dataList
-      const json = JSON.stringify(this.qdform);
-      this.$http.post("lawss/activiti/completeTask", {
-        taskIds: this.taskIds,
-        userId: this.userId,
-        json: json
-      }, {
         _this: this
       }, res => {
-        if (res.success) {
+        this.dataList = res.data.records;
-          this.$message.success(res.message);
+        this.dataList.forEach(item => {
-          this.$router.push("/processCenter");
+          // 责任部门转换
-        }
+          if (item.zrbm !== null || item.zrbm !== "" ) {
-        this.isSubmit = false;
+            let k = (item.zrbm || "").split(",");
-      }, e => {
+            for (let i in this.zrbmOptions) {
+              for (let m = 0; m < k.length; m++) {
+                if (this.zrbmOptions[i].value === k[m]) {
+                  k[m] = this.zrbmOptions[i].label;
+                }
+                item.zrbm = k.join(",");
+              }
+            }
+          }
+        });
+        this.dataList.map(item => {
+          if(item.zrbm === '[]'){
+            item.zrbm = ''
+          }
+        })
       });
     },
-    //转办事件
+    // 接受按钮
-    handleTransfer(){
+    handleAccept(){
-      this.drawerModal = true
+      this.isSubmit = true
-      this.drawerTitle = '转办处理人'
+      execTask({
-      this.selectPeople = row
+        todoId: this.todoId // 当前节点ID
+      }).then(res => {
+        if (res.sign && res.sign === '0') {
+          this.$message.success('接收成功')
+          this.$router.push('/processCenter')
+        }
+        this.isSubmit = false
+      })
+    },
+    //保存事件
+    handleSave() {
+      this.saveLoading = true;
+      let _formData = new FormData();
+      this.qdform.dataList = this.dataList
+      _formData.append("id", this.bpnId || "");
+      _formData.append("prcType", "10");
+      _formData.append('taskIds', this.taskIds)
+      _formData.append("json", JSON.stringify({
+        form: this.qdform,
+        commentText: this.commentText
+      }));
+      saveTaskForPub(_formData).then(res => {
+        this.saveLoading = false;
+        this.$message.success("保存成功");
+        this.bpnId = res.result;
+      }).catch(e => {
+        this.saveLoading = false;
+      });
+    },
+    handleRemark(){
+      this.dataList.map(item => {
+        if(item.involve === 'noInvolve'){
+          comFlag
+        }
+      })
     },
     //驳回事件
     beforeBack() {
@@ -451,9 +563,32 @@ export default {
         });
       }
     },
+    //提交事件
+    handleSubmit() {
+      this.isSubmit = true;
+      this.qdform.passFlag = "0";
+      this.qdform.commentText = this.commentText;
+      this.qdform.dataList = this.dataList
+      const json = JSON.stringify(this.qdform);
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+        this.isSubmit = false;
+      }, e => {
+      });
+    },
     //添加标准勾选框数据
-    selectStand(data) {
+    handleSelectTableChange (data) {
-      this.standList = data;
+      this.handleSelectTableList = data
+      console.log(this.handleSelectTableList);
     },
     selectStandChange(data){
       this.projectStand = data
@@ -477,7 +612,7 @@ export default {
         this.standList.map(item => {
           let addIndex
           addIndex = this.dataList.findIndex(items =>{
-            return items.standId === item.id
+            return items.id === item.id
           })
           if(addIndex > -1){
             this.$message.warning('请勿重复添加数据')
@@ -490,80 +625,13 @@ export default {
       }
 
     },
-    //添加标准的查询按钮
-    search() {
-      this.getStand();
-    },
-    clearSearch() {
-      this.standCommonlySearch = {
-        standSort: "",
-        standNumber: "",
-        standType: ""
-      };
-      this.getStand();
-    },
-    pageChange(page) {
-      this.page = page;
-      this.getStand();
-    },
-    pageSizeChange(pageSize) {
-      this.pageSize = pageSize;
-      this.getStand();
-    },
-    getStand(data) {
-      this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
-        id: this.detailedId,
-        page: this.page,
-        Size: this.pageSize,
-        ...this.standCommonlySearch
-      }, {
-        _this: this
-      }, res => {
-        if (res.data === null) {
-          this.standardData = "";
-          this.totalDo = "";
-        }
-        this.standardData = res.data.records;
-        this.standardData.forEach(item => {
-          if (item.zccssrqgj === "-") {
-            item.zccssrqgj = "";
-          }
-          if (item.xcxssrqgj === "-") {
-            item.xcxssrq = "";
-          }
-        });
-        this.total = res.data.total;
-      });
-    },
-    // 将文本状态的id与name对应
-    setMap(data) {
-      data.forEach(item => {
-        this.$set(this.textStatusMap, item.value, item.label);
-      });
-    },
   },
   computed: {
     listNoDataText() {
       return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
     }
   },
-  mounted() {
+
-    this.processTable();
-    this.getData();
-    // 查询各下拉框数据
-    this.$http.get("sys/dictype/getDicTypeListCode", "", {
-      _this: this,
-      loading: "loading"
-    }, res => {
-      this.energyKindOptions = res.data.ENERGYTYPES; //适用车型
-      this.standSortOptions = res.data.STANDCLASSIFY; // 标准类别
-      this.standStateOptions = res.data.WBZTCLASS; // 文本状态
-      this.setMap(this.zrbmMap, res.data.ZRBMCLASS);
-      this.setMap(this.standStateOptions);
-      this.showLocalProductData(this.getLocalPro);
-    }, e => {
-    });
-  }
 };
 </script>
 

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -901,6 +901,17 @@ export default {
                 prcType: row.prcType
               }
             })
+          }else if(row.taskInfo === '标准法规部经理审批'){
+            this.$router.push({
+              name: 'xmqdqrStep5',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
           }
           break
         case 'laws2':

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

@@ -100,12 +100,14 @@
           <el-table-column
             prop="standName"
             label="中文名称"
+            min-width="300"
             show-overflow-tooltip
           >
           </el-table-column>
           <el-table-column
             prop="standEnName"
             label="英文名称"
+            min-width="300"
             show-overflow-tooltip
           >
           </el-table-column>