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

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

@@ -1835,7 +1835,6 @@
 
                               const json = Object.assign(bringData, bringData.attrInfoCaseMap);
                               this.form = JSON.parse(JSON.stringify(json))
-
                               this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw.split(',') : []
                               this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr && JSON.parse(JSON.stringify(json)).wssmr !== '[]' ? JSON.parse(JSON.stringify(json)).wssmr.split(',') : []
                               this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs && JSON.parse(JSON.stringify(json)).zrgcs !== '[]' ? JSON.parse(JSON.stringify(json)).zrgcs.split(',') : []
@@ -1854,6 +1853,7 @@
                               this.key3++
                               this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
                               this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : ''
+                              this.form.ssrq =  this.$moment(this.form.ssrq).format("YYYY-MM-DD")
                               this.form.prcNum = this.prcNum
                               this.form.prcName = this.prcName
                               this.form['id'] = bringData.id

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

@@ -592,6 +592,7 @@ export default {
             }
           });
         });
+        this.$refs.multipleTable.clearSelection();
       }
       this.modalshowflag = false;
     },
@@ -616,11 +617,16 @@ export default {
         if (this.selectList.length > 0) {
           this.lsType = type;
           this.nodeList = [];
-          if(row.implementerId){
-            this.nodeList = row.implementerId.split(",");
-          }
           this.modalshowflag = true;
           this.drawerTitle = "批量选择责任人";
+          this.selectList.forEach(item =>{
+           if(item.implementerId){
+             this.nodeList = item.implementerId.split(",");
+           }
+          })
+          // if(row.implementerId){
+          //   this.nodeList = row.implementerId.split(",");
+          // }
         } else {
           this.$message.warning("请选择要分发的数据");
         }

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

@@ -135,6 +135,11 @@
           <template slot="title">填写信息</template>
         </process-title>
         <div class="tableTitle">
+          <div class="tableButton">
+            <el-button :disabled="acceptShow" class="common-button-primary add-button" type="primary" size="mini"
+                       @click="batchEdit">批量编辑
+            </el-button>
+          </div>
         </div>
         <el-table
           ref="multipleTable"
@@ -143,7 +148,7 @@
           style="width: 100%"
           border
           @selection-change="selectStandChange"
-          height="56%"
+          height="48%"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
              fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
           <el-table-column
@@ -211,10 +216,6 @@
               <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
-<!--          <el-table-column-->
-<!--            prop="productType"-->
-<!--            align="center"-->
-<!--            label="在研产品">-->
             <el-table-column
               prop="researchCompliance"
               align="center"
@@ -233,6 +234,7 @@
                 <el-input
                    v-else
                    :disabled="acceptShow"
+                   clearable
                     v-model="dataList[scope.$index].complianceReasons"
                     placeholder="请输入合规原因"
                 >
@@ -306,6 +308,7 @@
                       :disabled="acceptShow"
                       class="datePickLen"
                       clearable
+                      value-format="yyyy-MM-dd HH:mm:ss"
                       v-model="dataList[scope.$index].completionTime"
                       type="date"
                       placeholder="请选择日期">
@@ -313,104 +316,6 @@
                 </template>
               </el-table-column>
             </el-table-column>
-<!--          </el-table-column>-->
-<!--          <el-table-column-->
-<!--            align="center"-->
-<!--            label="在产产品">-->
-<!--            <el-table-column-->
-<!--              prop="productionCompliance"-->
-<!--              align="center"-->
-<!--              width="160"-->
-<!--              label="合规(具体情况)">-->
-<!--              <template slot-scope="scope">-->
-<!--                <el-input-->
-<!--                    v-if="dataList[scope.$index].zcNoCompliance && dataList[scope.$index].zcNoCompliance.length>0-->
-<!--                    || dataList[scope.$index].zcCountermeasures && dataList[scope.$index].zcCountermeasures>0-->
-<!--                    || dataList[scope.$index].zcCompletionTime && dataList[scope.$index].zcCompletionTime !== null"-->
-<!--                    disabled-->
-<!--                  v-model="dataList[scope.$index].zcComplianceReasons"-->
-<!--                  placeholder="请输入合规原因"-->
-<!--                >-->
-<!--                </el-input>-->
-<!--                <el-input-->
-<!--                    v-else-->
-<!--                    v-model="dataList[scope.$index].zcComplianceReasons"-->
-<!--                    placeholder="请输入合规原因"-->
-<!--                >-->
-<!--                </el-input>-->
-<!--              </template>-->
-<!--            </el-table-column>-->
-<!--            <el-table-column-->
-<!--              align="center"-->
-<!--              width="160"-->
-<!--              label="不合规">-->
-<!--              <el-table-column-->
-<!--                prop="productionNonCompliance"-->
-<!--                align="center"-->
-<!--                width="170"-->
-<!--                label="不合规项目">-->
-<!--                <template slot-scope="scope">-->
-<!--                  <el-input-->
-<!--                      v-if="dataList[scope.$index].zcComplianceReasons && dataList[scope.$index].zcComplianceReasons.length>0"-->
-<!--                      disabled-->
-<!--                    v-model="dataList[scope.$index].zcNoCompliance"-->
-<!--                    placeholder="请输入不合规项目"-->
-<!--                  >-->
-<!--                  </el-input>-->
-<!--                  <el-input-->
-<!--                      v-else-->
-<!--                      v-model="dataList[scope.$index].zcNoCompliance"-->
-<!--                      placeholder="请输入不合规项目"-->
-<!--                  >-->
-<!--                  </el-input>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-<!--              <el-table-column-->
-<!--                prop="productionCountermeasures"-->
-<!--                align="center"-->
-<!--                width="160"-->
-<!--                label="应对措施">-->
-<!--                <template slot-scope="scope">-->
-<!--                  <el-input-->
-<!--                      v-if="dataList[scope.$index].zcComplianceReasons && dataList[scope.$index].zcComplianceReasons.length>0"-->
-<!--                      disabled-->
-<!--                    v-model="dataList[scope.$index].zcCountermeasures"-->
-<!--                    placeholder="请输入应对措施"-->
-<!--                  >-->
-<!--                  </el-input>-->
-<!--                  <el-input-->
-<!--                      v-else-->
-<!--                      v-model="dataList[scope.$index].zcCountermeasures"-->
-<!--                      placeholder="请输入应对措施"-->
-<!--                  >-->
-<!--                  </el-input>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-<!--              <el-table-column-->
-<!--                prop="productionCompletionTime"-->
-<!--                align="center"-->
-<!--                width="140"-->
-<!--                label="完成时间">-->
-<!--                <template slot-scope="scope">-->
-<!--                  <el-date-picker-->
-<!--                      v-if="dataList[scope.$index].zcComplianceReasons && dataList[scope.$index].zcComplianceReasons.length>0"-->
-<!--                      disabled-->
-<!--                    v-model="dataList[scope.$index].zcCompletionTime"-->
-<!--                    type="date"-->
-<!--                    placeholder="请选择日期">-->
-<!--                  </el-date-picker>-->
-<!--                  <el-date-picker-->
-<!--                      v-else-->
-<!--                      class="datePickLen"-->
-<!--                      clearable-->
-<!--                      v-model="dataList[scope.$index].zcCompletionTime"-->
-<!--                      type="date"-->
-<!--                      placeholder="请选择日期">-->
-<!--                  </el-date-picker>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-<!--            </el-table-column>-->
-<!--          </el-table-column>-->
         </el-table>
       </div>
       <div>
@@ -521,6 +426,96 @@
         @checkedRole="checkedTransferRole"
         :nodeList="nodeList"
     ></Role-tree>
+<!--    批量编辑弹窗-->
+    <el-drawer
+      title="批量填写"
+      :visible.sync="modalShowFlag"
+      :wrapperClosable="false"
+      size="800px">
+      <div class="demo-drawer-content">
+        <el-form :model="batchEditForm" class="label-input-form" ref="projectComplianceForm" label-width="150">
+          <!--          <el-divider><span><b>在研产品</b></span></el-divider>-->
+          <el-formItem label="合规原因" class="add-form-item">
+            <el-input
+              v-if="batchEditForm.noCompliance && batchEditForm.noCompliance.length>0
+                    || batchEditForm.countermeasures && batchEditForm.countermeasures.length>0
+                    || batchEditForm.completionTime && batchEditForm.completionTime !== null"
+              disabled
+              v-model="batchEditForm.complianceReasons"
+              placeholder="请输入合规原因"
+            >
+            </el-input>
+            <el-input
+              v-else
+              :disabled="acceptShow"
+              v-model="batchEditForm.complianceReasons"
+              placeholder="请输入合规原因"
+            >
+            </el-input>
+          </el-formItem>
+          <el-form-item label="不合规项目" class="add-form-item">
+            <el-input
+              v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0"
+              disabled
+              v-model="batchEditForm.noCompliance"
+              placeholder="请输入不合规项目"
+            >
+            </el-input>
+            <el-input
+              v-else
+              :disabled="acceptShow"
+              v-model="batchEditForm.noCompliance"
+              placeholder="请输入不合规项目"
+            >
+            </el-input>
+          </el-form-item>
+          <el-form-item label="不合规应对措施" class="add-form-item">
+            <el-input
+              v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0"
+              disabled
+              v-model="batchEditForm.countermeasures"
+              placeholder="请输入不合规应对措施"
+            >
+            </el-input>
+            <el-input
+              v-else
+              :disabled="acceptShow"
+              v-model="batchEditForm.countermeasures"
+              placeholder="请输入不合规应对措施"
+            >
+            </el-input>
+          </el-form-item>
+          <el-form-item label="完成时间" class="add-form-item">
+            <el-date-picker
+              v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0"
+              disabled
+              v-model="batchEditForm.completionTime"
+              type="date"
+              placeholder="请选择日期">
+            </el-date-picker>
+            <el-date-picker
+              v-else
+              :disabled="acceptShow"
+              class="datePickLen"
+              clearable
+              value-format="yyyy-MM-dd HH:mm:ss"
+              v-model="batchEditForm.completionTime"
+              type="date"
+              placeholder="请选择日期">
+            </el-date-picker>
+          </el-form-item>
+          <br>
+        </el-form>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary"
+                   @click="saveBatchEditForm">
+          确定
+        </el-button>
+        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelBatchEditForm">取消
+        </el-button>
+      </div>
+    </el-drawer>
   </div>
 </template>
 
@@ -542,11 +537,24 @@ export default {
     return {
       //折叠的标志，true为折叠，false为不折叠
       foldFormFlag: false,
+      comFlag: 0,
       nodeList:[],
       drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,
+      modalShowFlag: false, // 批量编辑开关
+      batchEditForm: {
+        // 在研产品
+        // 合规
+        complianceReasons: "",
+        // 不合规
+        noCompliance: "",
+        // 应对措施
+        countermeasures: "",
+        // 完成时间
+        completionTime: "",
+      },
       detailData: [],
       sarProStateTableHeight: null, // 项目列表高度
       // 当前流程类型(1待办/2已办)
@@ -720,6 +728,7 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList(item) {
+      console.log(item);
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
         if (item.form === undefined) {
@@ -729,6 +738,12 @@ export default {
               item.implementer = this.$store.getters.userInfo.userName;
             });
             this.dataList = item.step3DTOS;
+            this.dataList.forEach(item => {
+              this.$set(item,'complianceReasons', '')
+              this.$set(item,'noCompliance', '')
+              this.$set(item,'countermeasures', '')
+              this.$set(item,'completionTime', '')
+            })
 
           } else {
             this.dataList = item.dataList;
@@ -792,30 +807,80 @@ export default {
         this.isSubmit = false
       })
     },
+    handlePrice(){
+      for (let i = 0; i < this.dataList.length; i++) {
+        if (this.dataList[i].complianceReasons !== '' || (this.dataList[i].noCompliance !== '' && this.dataList[i].countermeasures !== '' && this.dataList[i].completionTime !== '') || (this.dataList[i].complianceReasons === '' && this.dataList[i].noCompliance === '' && this.dataList[i].countermeasures === '' && this.dataList[i].completionTime === '')){
+        }else {
+          this.comFlag ++
+        }
+      }
+    },
     //提交事件
     handleSubmit() {
-      this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
-      this.listForm.commentText = this.commentText;
-      this.listForm.approvalOpinion = "";
-      this.listForm.signFlag = "";
-      this.listForm.dataList = this.dataList;
-      const json = JSON.stringify(this.listForm);
-      this.isSubmit = true;
-      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 => {
+      this.handlePrice()
+      if(this.comFlag > 0) {
+        this.$message.warning('请填写完整的不符合项信息')
+        this.comFlag = 0
+      }else{
+        this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
+        this.listForm.commentText = this.commentText;
+        this.listForm.approvalOpinion = "";
+        this.listForm.signFlag = "";
+        this.listForm.dataList = this.dataList;
+        const json = JSON.stringify(this.listForm);
+        this.isSubmit = true;
+        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 => {
 
+        });
+      }
+    },
+    //批量编辑
+    batchEdit() {
+      if (this.selectList.length > 0) {
+        //合规
+        this.batchEditForm.complianceReasons = "";
+        //不合规
+        this.batchEditForm.noCompliance = "";
+        //应对措施
+        this.batchEditForm.countermeasures = "";
+        //完成时间
+        this.batchEditForm.completionTime = "";
+        this.modalShowFlag = true;
+      } else {
+        this.$message.warning("请选择要编辑的数据");
+      }
+    },
+    //批量编辑确定按钮事件
+    saveBatchEditForm() {
+      this.dataList.forEach(item => {
+        this.selectList.forEach(items => {
+          if (item.id === items) {
+            item.complianceReasons = this.batchEditForm.complianceReasons;
+            //不合规
+            item.noCompliance = this.batchEditForm.noCompliance;
+            //应对措施
+            item.countermeasures = this.batchEditForm.countermeasures;
+            //完成时间
+            item.completionTime = this.batchEditForm.completionTime;
+          }
+        });
       });
+      this.modalShowFlag = false;
+    },
+    cancelBatchEditForm() {
+      this.modalShowFlag = false;
     },
     //标准表格选择框改变
     selectStandChange(data) {

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

@@ -110,10 +110,6 @@
               <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="productType"
-            align="center"
-            label="在研产品">
             <el-table-column
               prop="complianceReasons"
               align="center"
@@ -147,43 +143,6 @@
                 </template>
               </el-table-column>
             </el-table-column>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            label="在产产品">
-            <el-table-column
-              prop="zcComplianceReasons"
-              align="center"
-              width="160"
-              label="合规(具体情况)">
-            </el-table-column>
-            <el-table-column
-              align="center"
-              width="160"
-              label="不合规">
-              <el-table-column
-                prop="zcNoCompliance"
-                align="center"
-                width="170"
-                label="不合规项目">
-              </el-table-column>
-              <el-table-column
-                prop="zcCountermeasures"
-                align="center"
-                width="160"
-                label="应对措施">
-              </el-table-column>
-              <el-table-column
-                prop="zcCompletionTime"
-                align="center"
-                width="120"
-                label="完成时间">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
-                </template>
-              </el-table-column>
-            </el-table-column>
-          </el-table-column>
           <el-table-column
             prop="workPeople"
             align="center"

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

@@ -439,11 +439,13 @@ export default {
         if (this.selectList.length > 0) {
           this.zrType = type;
           this.nodeList = [];
-          if (row.workPeopleId) {
-            this.nodeList = row.workPeopleId.split(",");
-          }
           this.modalshowflag = true;
           this.drawerTitle = "批量选择责任人";
+          this.selectList.forEach(item =>{
+            if(item.workPeopleId){
+              this.nodeList = item.workPeopleId.split(",");
+            }
+          })
         } else {
           this.$message.warning("请选择要分发的数据");
         }

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

@@ -142,7 +142,6 @@
               >
               </el-input>
               <el-input
-                @click.native="handlePrice(scope.row)"
                 v-else
                 :disabled="acceptShow"
                 v-model="scope.row.complianceReasons"
@@ -172,7 +171,6 @@
                 <el-input
                   v-else
                   :disabled="acceptShow"
-                  @click.native="handlePrice(scope.row)"
                   v-model="scope.row.noCompliance"
                   placeholder="请输入不合规项目"
                 >
@@ -195,7 +193,6 @@
                 <el-input
                   v-else
                   :disabled="acceptShow"
-                  @click.native="handlePrice(scope.row)"
                   v-model="scope.row.countermeasures"
                   placeholder="请输入应对措施"
                 >
@@ -220,7 +217,6 @@
                   :disabled="acceptShow"
                   class="datePickLen"
                   clearable
-                  @click.native="handlePrice(scope.row)"
                   v-model="scope.row.completionTime"
                   type="date"
                   value-format="yyyy-MM-dd HH:mm:ss"
@@ -456,7 +452,7 @@
     ></Role-tree>
     <el-drawer
       title="批量填写"
-      :visible.sync="modalshowflag"
+      :visible.sync="modalShowFlag"
       :wrapperClosable="false"
       size="800px">
       <div class="demo-drawer-content">
@@ -527,36 +523,11 @@
               clearable
               v-model="batchEditForm.completionTime"
               type="date"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="请选择日期">
             </el-date-picker>
           </el-form-item>
           <br>
-<!--          <el-divider><span><b>在产产品</b></span></el-divider>-->
-<!--          <el-formItem label="合规原因" class="add-form-item">-->
-<!--            <el-input-->
-<!--              v-model="batchEditForm.zcComplianceReasons"-->
-<!--              placeholder="请输入合规原因"-->
-<!--            ></el-input>-->
-<!--          </el-formItem>-->
-<!--          <el-form-item label="不合规项目" class="add-form-item">-->
-<!--            <el-input-->
-<!--              v-model="batchEditForm.zcNoCompliance"-->
-<!--              placeholder="请输入不合规项目"-->
-<!--            ></el-input>-->
-<!--          </el-form-item>-->
-<!--          <el-form-item label="不合规应对措施" class="add-form-item">-->
-<!--            <el-input-->
-<!--              v-model="batchEditForm.zcCountermeasures"-->
-<!--              placeholder="请输入不合规应对措施"-->
-<!--            ></el-input>-->
-<!--          </el-form-item>-->
-<!--          <el-form-item label="完成时间" class="add-form-item">-->
-<!--            <el-date-picker-->
-<!--              v-model="batchEditForm.zcCompletionTime"-->
-<!--              type="date"-->
-<!--              placeholder="选择日期">-->
-<!--            </el-date-picker>-->
-<!--          </el-form-item>-->
         </el-form>
       </div>
       <div class="demo-drawer-footer">
@@ -587,7 +558,7 @@ export default {
   },
   data() {
     return {
-      comFlag: true,
+      comFlag: 0,
       total: 0,
       currentPage: 1,
       pageSize: 20,
@@ -628,7 +599,7 @@ export default {
       todoId: "",
       showColumn: true,
       drawerTitle: "", //drawer标题
-      modalshowflag: false, // drawer开关
+      modalShowFlag: false, // drawer开关
       selectList: [],
       treeData: [], // 人员数据
       roleForm: {
@@ -723,10 +694,10 @@ export default {
           }
         });
       });
-      this.modalshowflag = false;
+      this.modalShowFlag = false;
     },
     cancelBatchEditForm() {
-      this.modalshowflag = false;
+      this.modalShowFlag = false;
     },
     //批量编辑
     batchEdit() {
@@ -739,15 +710,7 @@ export default {
         this.batchEditForm.countermeasures = "";
         //完成时间
         this.batchEditForm.completionTime = "";
-        //合规
-        this.batchEditForm.zcComplianceReasons = "";
-        //不合规
-        this.batchEditForm.zcNoCompliance = "";
-        //应对措施
-        this.batchEditForm.zcCountermeasures = "";
-        //完成时间
-        this.batchEditForm.zcCompletionTime = "";
-        this.modalshowflag = true;
+        this.modalShowFlag = true;
       } else {
         this.$message.warning("请选择要编辑的数据");
       }
@@ -932,17 +895,20 @@ export default {
         this.isSubmit = false;
       });
     },
-    handlePrice(row){
-      if(row.complianceReasons !== '' || (row.noCompliance !== '' && row.countermeasures !== '' && row.completionTime !== '') || (row.complianceReasons === '' && row.noCompliance === '' && row.countermeasures === '' && row.completionTime === '')){
-        this.comFlag = true
-      }else{
-        this.comFlag = false
+    handlePrice(){
+      for (let i = 0; i < this.dataList.length; i++) {
+        if (this.dataList[i].complianceReasons !== '' || (this.dataList[i].noCompliance !== '' && this.dataList[i].countermeasures !== '' && this.dataList[i].completionTime !== undefined) || (this.dataList[i].complianceReasons === '' && this.dataList[i].noCompliance === '' && this.dataList[i].countermeasures === '' && this.dataList[i].completionTime === undefined)){
+        }else {
+          this.comFlag ++
+        }
       }
     },
     //提交事件
     handleSubmit() {
-      if(!this.comFlag){
+      this.handlePrice()
+      if(this.comFlag > 0) {
         this.$message.warning('请填写完整的不符合项信息')
+        this.comFlag = 0
       }else{
         this.isSubmit = true;
         this.listForm.commentText = this.commentText;