评估流程

src/pages/processCenter/pages/components/ProcessMixin.vue

@@ -26,7 +26,7 @@ export default {
               },
               {
                   label: '项目合规评估流程',
-                  value: '7'
+                  value: '5'
               },
               {
                   label: '未符合项整改流程',

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

@@ -67,48 +67,48 @@
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
+<!--              <el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">-->
-                <el-input
+<!--                <el-input-->
-                  disabled
+<!--                  disabled-->
-                  style="display: none;"
+<!--                  style="display: none;"-->
-                  v-model="listForm.modelName"
+<!--                  v-model="listForm.modelName"-->
-                  clearable
+<!--                  clearable-->
-                ></el-input>
+<!--                ></el-input>-->
-                <div v-if="listForm.modelName" @click="fileUpload" class="fileClass">
+<!--                <div v-if="listForm.modelName" @click="fileUpload" class="fileClass">-->
-                  {{ listForm.modelName }}
+<!--                  {{ listForm.modelName }}-->
-                </div>
+<!--                </div>-->
-                <div v-else>
+<!--                <div v-else>-->
-                  <el-button
+<!--                  <el-button-->
-                    type="primary"
+<!--                    type="primary"-->
-                    class="common-button-primary"
+<!--                    class="common-button-primary"-->
-                    @click="fileUpload"
+<!--                    @click="fileUpload"-->
-                    size="mini">
+<!--                    size="mini">-->
-                    点击上传
-                  </el-button>
-                </div>
-              </el-form-item>
-<!--              <el-form-item label="附件" prop="fileId" class="add-form-item form-item-disabled">-->
-<!--                <el-upload-->
-<!--                  v-if="listForm.fileId == null || this.listForm.fileId== 'undefined' || this.listForm.fileId == '' "-->
-<!--                  :action="uploadFileListPath"-->
-<!--                  show-file-list-->
-<!--                  :file-list="fileInfoList"-->
-<!--                  name="file"-->
-<!--                  accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"-->
-<!--                  :on-remove="delFileInfo"-->
-<!--                  :on-success="uploadBackSuccess"-->
-<!--                  :before-upload="beforeUpload"-->
-<!--                >-->
-<!--                  <el-button class="common-button-default" size="mini">-->
 <!--                    点击上传-->
 <!--                  </el-button>-->
-<!--                </el-upload>-->
+<!--                </div>-->
-<!--                <el-input-->
-<!--                  v-else-->
-<!--                  v-model="listForm.fileId"-->
-<!--                  placeholder=""-->
-<!--                ></el-input>-->
 <!--              </el-form-item>-->
+              <el-form-item label="附件" prop="fileId" class="add-form-item form-item-disabled">
+                <el-upload
+                  v-if="listForm.fileId == null || this.listForm.fileId== 'undefined' || this.listForm.fileId == '' "
+                  :action="uploadFileListPath"
+                  show-file-list
+                  :file-list="fileInfoList"
+                  name="file"
+                  accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
+                  :on-remove="delFileInfo"
+                  :on-success="uploadBackSuccess"
+                  :before-upload="beforeUpload"
+                >
+                  <el-button class="common-button-default" size="mini">
+                    点击上传
+                  </el-button>
+                </el-upload>
+                <el-input
+                  v-else
+                  v-model="listForm.fileId"
+                  placeholder=""
+                ></el-input>
+              </el-form-item>
               <el-form-item label="会签" prop="sign" class="add-form-item form-item-disabled">
                 <el-radio-group v-model="signFlag" @change="selectSign">
                   <el-radio label="1">是</el-radio>
@@ -1111,6 +1111,46 @@ export default {
     fileUpload () {
       this.fileMadel = true
     },
+    // 上传文件成功回调
+    uploadBackSuccess (res, file, fileList) {
+      console.log(file);
+      console.log(fileList)
+      if (res.ok) {
+        this.fileInfoList = fileList
+        this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
+        this.$message.success('上传成功')
+      } else {
+        this.$message.error(res.message)
+        fileList.pop()
+      }
+    },
+    // 相关附件 上传之前钩子
+    beforeUpload (file) {
+      var filename = file.name
+      var index1 = filename.lastIndexOf('.')
+      var index2 = filename.length
+      var fileSuffix = filename.substring(index1, index2)
+      // const fileSuffix = file.name.split('.')[1] // 后缀名
+      //把后缀转大写
+      if(fileSuffix !== undefined && fileSuffix !== null){
+        fileSuffix = fileSuffix.toUpperCase()
+      }
+      // 判断上传文件格式
+      if (fileSuffix === '.PDF' || fileSuffix === '.DOC' || fileSuffix === '.DOCX' || fileSuffix === '.PPT'
+        || fileSuffix === '.PPTX'|| fileSuffix === '.XLS'|| fileSuffix === '.XLSX'
+        || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG') {
+        return true
+      } else {
+        this.$message.error('文件' + file.name + '格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件')
+        return false
+      }
+      // 判断文件上传大小
+      if (file.size / 1024 / 1024 > 300) {
+        this.$message.warning('文件' + file.name + '大小不能超过300M')
+        return false
+      }
+      return true
+    },
     // 点击查看
     handlePreview (item) {
       let routeUrl = this.$router.resolve({

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

@@ -629,42 +629,49 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      var json = Object.assign(this.listForm, this.roleForm)
+      this.dataList.forEach(item => {
-      json.prcCreateUser = this.$store.getters.userInfo.userId;
+        if(item.distributePerson === '' || item.distributePerson === null || item.distributePerson === undefined){
-      json.prcCreateUserName = this.$store.getters.userInfo.account;
+          this.$message.warning('请选择分发责任人')
-      json.standId = this.listForm.standId;
+        } else {
-      json.XCXSSRQ =  this.sarAccessListDatas[0].xcxssrqgj
+          var json = Object.assign(this.listForm, this.roleForm)
-      json.ZCCSSRQ =  this.sarAccessListDatas[0].zccssrqgj
+          json.prcCreateUser = this.$store.getters.userInfo.userId;
-      this.$refs['listForm'].validate((valid) => {
+          json.prcCreateUserName = this.$store.getters.userInfo.account;
-        if (valid) {
+          json.standId = this.listForm.standId;
-          this.$refs['roleForm'].validate((valid) => {
+          json.XCXSSRQ =  this.sarAccessListDatas[0].xcxssrqgj
+          json.ZCCSSRQ =  this.sarAccessListDatas[0].zccssrqgj
+          this.$refs['listForm'].validate((valid) => {
             if (valid) {
-              this.$http.get("lawss/activiti/startProcess", { type: "5" }, {
+              this.$refs['roleForm'].validate((valid) => {
-                _this: this
+                if (valid) {
-              }, res => {
+                  this.$http.get("lawss/activiti/startProcess", { type: "5" }, {
-                if (res.ok) {
-                  this.$http.post("lawss/activiti/completeTask", {
-                    taskIds: res.data,
-                    userId: this.$store.getters.userInfo.userId,
-                    json: JSON.stringify(json)
-                  }, {
                     _this: this
                   }, res => {
-                    if (res.success) {
+                    if (res.ok) {
-                      this.$message.success(res.message);
+                      this.$http.post("lawss/activiti/completeTask", {
-                      this.$router.push("/processCenter");
+                        taskIds: res.data,
+                        userId: this.$store.getters.userInfo.userId,
+                        json: JSON.stringify(json)
+                      }, {
+                        _this: this
+                      }, res => {
+                        if (res.success) {
+                          this.$message.success(res.message);
+                          this.$router.push("/processCenter");
+                        }
+                      });
                     }
                   });
+                } else {
+                  return this.$message.warning("请完善人员信息");
                 }
               });
             } else {
-              return this.$message.warning("请完善人员信息");
+              return this.$message.warning("请完善基础信息");
             }
           });
-        } else {
-          return this.$message.warning("请完善基础信息");
         }
-      });
+      })
+
     },
     //选择拆分标准取消事件
     closeDrawer() {
@@ -683,7 +690,6 @@ export default {
         }, {
           _this: this
         }, res => {
-          console.log(res)
           this.listForm.breakdownList = res.data;
           this.ListModel = false;
         }, e => {

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

@@ -303,7 +303,6 @@ 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)
@@ -317,7 +316,6 @@ export default {
      */
     getFormFieldList (item) {
       this.$nextTick(() => {
-        console.log(item.dataList)
         this.listForm = JSON.parse(JSON.stringify(item))
         this.listForm.prcNum = this.prcNum
         this.listForm.prcName = this.prcName

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

@@ -364,7 +364,6 @@ 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);
@@ -386,6 +385,7 @@ export default {
       for (let i = 0; i < item.pepdtos.length; i++) {
         for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) {
           this.listForm.breakdownList.push({
+            itemId: new Date().getTime(),
             itemsName: item.pepdtos[i].breakdownList[j].itemsName,
             itemNum: item.pepdtos[i].breakdownList[j].itemsNum,
             responsibleEngineer: item.pepdtos[i].breakdownList[j].responsibleEngineer,
@@ -406,14 +406,23 @@ export default {
             zCCSSRQ:  item.pepdtos[i].zCCSSRQ,
           });
         }
-        console.log(item.pepdtos);
       }
     },
     saveUserInfo() {
       if (this.type === "implementer") {
+        // 如果有勾选的项
+        if (this.selectList.length) {
+          this.listForm.breakdownList.forEach((item, index) => {
+            if (this.selectList.includes(item.itemId)) {
+              this.listForm.breakdownList[index].implementerId = this.roleRow.id;
+              this.listForm.breakdownList[index].implementer = this.roleRow.name;
+            }
+          })
+        } else {
+          this.listForm.breakdownList[this.dsadadadsada].implementerId = this.roleRow.id;
+          this.listForm.breakdownList[this.dsadadadsada].implementer = this.roleRow.name;
+        }
         this.listForm.implementer = this.roleRow.name;
-        this.listForm.breakdownList[this.dsadadadsada].implementerId = this.roleRow.id;
-        this.listForm.breakdownList[this.dsadadadsada].implementer = this.roleRow.name;
         this.showColumn = false;
         this.$nextTick(() => {
           this.showColumn = true;
@@ -443,28 +452,34 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
+      this.listForm.breakdownList.forEach(item => {
-      this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
+        if(item.implementer === null || item.implementer === '' || item.implementer === undefined){
-      this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
+          this.$message.warning('请选择落实人')
-      this.listForm.zrUserId = this.$store.getters.userInfo.userId;
+        } else {
-      this.listForm.commentText = this.commentText;
+          this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
-      this.listForm.approvalOpinion = "";
+          this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
-      this.listForm.signFlag = "";
+          this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
-      const json = JSON.stringify(this.listForm.breakdownList);
+          this.listForm.zrUserId = this.$store.getters.userInfo.userId;
-      this.$http.post("lawss/activiti/completeTask", {
+          this.listForm.commentText = this.commentText;
-        taskIds: this.taskIds,
+          this.listForm.approvalOpinion = "";
-        userId: this.userId,
+          this.listForm.signFlag = "";
-        json: json
+          const json = JSON.stringify(this.listForm.breakdownList);
-      }, {
+          this.$http.post("lawss/activiti/completeTask", {
-        _this: this
+            taskIds: this.taskIds,
-      }, res => {
+            userId: this.userId,
-        if (res.success) {
+            json: json
-          this.$message.success(res.message);
+          }, {
-          this.$router.push("/processCenter");
+            _this: this
-        }
+          }, res => {
-      }, e => {
+            if (res.success) {
+              this.$message.success(res.message);
+              this.$router.push("/processCenter");
+            }
+          }, e => {
 
-      });
+          });
+        }
+      })
     },
     drawerCheck(data) {
       var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
@@ -477,10 +492,7 @@ export default {
     },
     //标准表格选择框改变
     selectStandChange(data) {
-      this.selectList = [];
+      this.selectList = data.map(item => item.itemId)
-      for (let i = 0; i < data.length; i++) {
-        this.selectList.push(data[i].id);
-      }
     },
     selectThree() {
 

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

@@ -477,7 +477,6 @@ 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)

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

@@ -419,7 +419,6 @@ 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)
@@ -432,7 +431,6 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList (item) {
-      console.log(item);
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item))
         this.listForm.prcNum = this.prcNum
@@ -461,7 +459,6 @@ export default {
       this.listForm.fenFlag = "1";
       this.listForm.dataList = this.dataList
       const json = JSON.stringify(this.listForm);
-      console.log(json);
       this.$http.post('lawss/activiti/completeTask', {
         taskIds: this.taskIds,
         userId: this.userId,
@@ -504,7 +501,6 @@ export default {
   mounted() {
     this.processTable()
     this.getData()
-    // console.log(this.$store.getters.getHandleInfo);
   }
 };
 </script>

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

@@ -419,7 +419,6 @@ 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)
@@ -432,13 +431,12 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList (item) {
-      console.log(item);
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item))
         this.listForm.prcNum = this.prcNum
         this.listForm.prcName = this.prcName
         this.listForm['id'] = item.id
-        this.dataList = item.step3DTOS
+        this.dataList = item.dataList
         this.listForm.standName = item.step3DTOS[0].standName
         this.listForm.standNumber = item.step3DTOS[0].standNumber
         this.listForm.qualityEngineer = item.step3DTOS[0].qualityEngineer
@@ -503,7 +501,6 @@ export default {
   mounted() {
     this.processTable()
     this.getData()
-    // console.log(this.$store.getters.getHandleInfo);
   }
 };
 </script>

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

@@ -419,7 +419,6 @@ 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)
@@ -432,7 +431,6 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList (item) {
-      console.log(item.dataList);
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item))
         this.listForm.prcNum = this.prcNum
@@ -501,7 +499,6 @@ export default {
   mounted() {
     this.processTable()
     this.getData()
-    // console.log(this.$store.getters.getHandleInfo);
   }
 };
 </script>