清单流程

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

@@ -39,7 +39,7 @@
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item label="适用区域" prop="applyRegion" class="add-form-item form-item-disabled">
+              <el-form-item label="适用区域" prop="applyRegion" class="add-form-item form-item-disabled add-form-el-select">
 <!--                <el-input-->
 <!--                  v-model="listForm.applyRegion"-->
 <!--                  placeholder="请输入适用区域"-->
@@ -48,7 +48,7 @@
                 <el-select
                   width="120"
                   v-model="listForm.applyRegion"
-                  placeholder="请选择"
+                  placeholder="请选择适用区域"
                   filterable
                 >
                   <el-option
@@ -67,28 +67,48 @@
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item label="附件" prop="fileId" class="add-form-item form-item-disabled">
+              <el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
-                <el-upload
+                <el-input
-                  v-if="listForm.fileId == null || this.listForm.fileId== 'undefined' || this.listForm.fileId == '' "
+                  disabled
-                  :action="uploadFileListPath"
+                  style="display: none;"
-                  show-file-list
+                  v-model="listForm.modelName"
-                  :file-list="fileInfoList"
+                  clearable
-                  name="file"
+                ></el-input>
-                  accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
+                <div v-if="listForm.modelName" @click="fileUpload" class="fileClass">
-                  :on-remove="delFileInfo"
+                  {{ listForm.modelName }}
-                  :on-success="uploadBackSuccess"
+                </div>
-                  :before-upload="beforeUpload"
+                <div v-else>
-                >
+                  <el-button
-                  <el-button class="common-button-default" size="mini">
+                    type="primary"
+                    class="common-button-primary"
+                    @click="fileUpload"
+                    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>
@@ -182,7 +202,7 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="选择会签责任人,填写意见" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="选择会签责任人,填写意见" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '1'">
               <el-card>
                 <el-form-item prop="dockUserName" style="margin-bottom: 0">
                   <h4>会签人</h4>
@@ -195,6 +215,19 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
+            <el-timeline-item timestamp="选择会签责任人,填写意见" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '2'">
+              <el-card>
+                <el-form-item prop="dockUserName2" style="margin-bottom: 0">
+                  <h4>会签人</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.dockUserName" placeholder="选择会签责任人"
+                              @click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)">
+                    </el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
             <el-timeline-item timestamp="根据会签意见修订" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="ministerUserName" style="margin-bottom: 0">
@@ -598,6 +631,24 @@
         <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
       </div>
     </el-drawer>
+    <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
+      <el-upload
+        multiple
+        drag
+        :action="fileUrl"
+        ref="importfile"
+        name="file"
+        accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+        :before-upload="beginImportFile"
+        :on-success="importFileSuccess"
+        :show-file-list="false"
+      >
+        <div style="padding: 20px 0">
+          <i class="el-icon-upload" style="color: #3399ff"></i>
+          <p>点击或拖拽上传文件</p>
+        </div>
+      </el-upload>
+    </el-dialog>
   </div>
 </template>
 
@@ -617,6 +668,8 @@ export default {
   },
   data() {
     return {
+      fileUrl: 'api/att/attFile/upload',
+      fileMadel: false,
       standList: [], //新添加的标准
       modalshowflag: false, // drawer开关
       drawerTitle: "", //drawer标题
@@ -686,7 +739,9 @@ export default {
         listName: "", //清单名称
         applyRegion: "", //适用区域
         descriptionList: "", //清单说明
-        fileId: "", //附件
+        fileId:'',
+        model: '', // 上传模板
+        modelName: '',
         standId: "", //选择的清单的id
         signFlag: "1",  //是否会签  1为会签 2为不会签
         inforlist: "", //用来存放标准列表的标准id
@@ -856,12 +911,12 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      // let json = this.listForm;
+      let json = this.listForm;
-      let json = Object.assign(this.listForm, this.roleForm)
+      // let json = Object.assign(this.listForm, this.roleForm)
-      json.zrUserId = this.$store.getters.userInfo.userId;
+      json.zrUserId = this.roleForm.dockUser; //会签人
-      json.jlUserId = this.$store.getters.userInfo.userId;
+      json.jlUserId = this.roleForm.directorUser;   //业务经理
       // (如果是业务经理应该这样写 后续需要更改 例：json.jlUserId = this.roleForm.directorUser;)
-      json.applyUpdUserId = this.$store.getters.userInfo.userId;
+      json.applyUpdUserId = this.roleForm.ministerUser; // 修订人
       json.approvalOpinion = "";
       json.prcCreateUser = this.$store.getters.userInfo.userId;
       json.prcCreateUserName = this.$store.getters.userInfo.account;
@@ -900,23 +955,81 @@ export default {
     },
     // 删除上传的文件
     delFileInfo(file, fileList) {
-      // this.fileInfoList = fileList
+      this.fileInfoList = fileList
     },
-    // 上传文件成功回调
+    fileUpload () {
-    uploadBackSuccess(res, file, fileList) {
+      this.fileMadel = true
-      // 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() {
+    importFileSuccess (response, file) {
-
+      if (response.ok) {
+        this.fileMadel = false
+        this.listForm.model = response.data.id
+        this.listForm.modelName = response.data.name
+        this.$message({
+          showClose: true,
+          message: response.message,
+          type: 'success'
+        })
+      }
     },
+    // 导入按钮 上传之前的钩子
+    beginImportFile (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 === '.PDF' || fileSuffix === '.DOC' || fileSuffix === '.DOCX' || fileSuffix === '.PPT'
+            || fileSuffix === '.PPTX'|| fileSuffix === '.XLS'|| fileSuffix === '.XLSX'
+            || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' ||
+        fileSuffix === '.pdf' || fileSuffix === '.doc' || fileSuffix === '.docx' || fileSuffix === '.ppt'
+        || fileSuffix === '.pptx'|| fileSuffix === '.xls'|| fileSuffix === '.xlsx'
+        || fileSuffix === '.png'|| fileSuffix === '.jpg'|| fileSuffix === '.jpeg') {
+        return true
+      } else {
+        this.spinShow = false
+        this.$message.error('文件' + file.name + '格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件')
+        return false
+      }
+      // 判断文件上传大小
+      // eslint-disable-next-line no-unreachable
+      if (file.size / 1024 / 1024 <= 200) {
+        return true
+      } else {
+        this.$message.error('文件' + file.name + '大小不超过200M')
+        return false
+      }
+      return true
+    },
+    // beginImportFile (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 === '.PDF' || fileSuffix === '.DOC' || fileSuffix === '.DOCX' || fileSuffix === '.PPT'
+    //     || fileSuffix === '.PPTX'|| fileSuffix === '.XLS'|| fileSuffix === '.XLSX'
+    //     || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG') {
+    //     return true
+    //   } else {
+    //     this.spinShow = false
+    //     this.$message.error('文件' + file.name + '格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件')
+    //     return false
+    //   }
+    //   // 判断文件上传大小
+    //   // eslint-disable-next-line no-unreachable
+    //   if (file.size / 1024 / 1024 <= 200) {
+    //     return true
+    //   } else {
+    //     this.$message.error('文件' + file.name + '大小不超过200M')
+    //     return false
+    //   }
+    //   return true
+    // },
     //选择清单取消事件
     closeDrawer() {
       this.ListModel = false;
@@ -1123,7 +1236,11 @@ export default {
       }
     }
   }
-
+  .add-form-el-select{
+    /deep/ .el-select{
+      width: 210px;
+    }
+  }
   .demo-drawer-content {
     margin-top: 10px;
   }

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

@@ -344,6 +344,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)
@@ -363,6 +364,9 @@ export default {
         this.listForm['id'] = item.id
         this.listForm.dataList = item.dataList
         this.dataList = item.dataList
+        this.listForm.applyUpdUserId = item.applyUpdUserId
+        this.listForm.jlUserId = item.jlUserId
+        this.listForm.zrUserId = item.zrUserId
       })
     },
 
@@ -373,10 +377,11 @@ export default {
     },
     //提交事件
     handleSubmit() {
+      this.listForm.applyUpdUserId = this.listForm.applyUpdUserId;
+      this.listForm.zrUserId = this.listForm.zrUserId;
+      this.listForm.jlUserId = this.listForm.jlUserId;
       this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
-      this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
       this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
-      this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
       this.listForm.commentText = this.commentText;
       this.listForm.approvalOpinion = "";
       this.listForm.standId = this.listForm.standId;

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

@@ -499,6 +499,9 @@ export default {
         this.listForm['id'] = item.id
         this.listForm.dataList = item.dataList
         this.dataList = item.dataList
+        this.listForm.applyUpdUserId = item.applyUpdUserId
+        this.listForm.jlUserId = item.jlUserId
+        this.listForm.zrUserId = item.zrUserId
       })
     },
     //保存事件
@@ -515,11 +518,12 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      this.listForm.jlUserId = this.$store.getters.userInfo.userId ;
+      this.listForm.applyUpdUserId = this.listForm.applyUpdUserId;
+      this.listForm.zrUserId = this.listForm.zrUserId;
+      this.listForm.jlUserId = this.listForm.jlUserId;
       this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
       this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
       this.listForm.commentText = this.commentText;
-      this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
       this.listForm.approvalOpinion = "";
       this.listForm.standId = this.listForm.standId;
       const json = JSON.stringify(this.listForm);

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

@@ -335,6 +335,9 @@ export default {
         this.listForm['id'] = item.id
         this.listForm.dataList = item.dataList
         this.dataList = item.dataList
+        this.listForm.applyUpdUserId = item.applyUpdUserId
+        this.listForm.jlUserId = item.jlUserId
+        this.listForm.zrUserId = item.zrUserId
       })
     },
     //驳回事件
@@ -344,12 +347,12 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      this.listForm.jlUserId = this.$store.getters.userInfo.userId ;
+      this.listForm.applyUpdUserId = this.listForm.applyUpdUserId;
+      this.listForm.zrUserId = this.listForm.zrUserId;
+      this.listForm.jlUserId = this.listForm.jlUserId;
       this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
-      this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
       this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
       this.listForm.commentText = this.commentText;
-      this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
       this.listForm.signflag = "";
       this.listForm.standId = this.listForm.standId;
       const json = JSON.stringify(this.listForm);

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

@@ -281,8 +281,12 @@ export default {
     exportProducdata() {},
     deleteStandLawsForProduct() {},
     selectStandLawsForProduct() {},
-    pageChangeLaws() {},
+    pageChangeLaws() {
-    pageSizeChangeLaws() {},
+
+    },
+    pageSizeChangeLaws() {
+
+    },
     standSelectChange() {},//选项值发生改变
 
   },

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

@@ -204,7 +204,11 @@
         </div>
       </div>
       <div class="footer">
-        <pagination :page="pageNo" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
+        <pagination
+          :page="pageNo"
+          :total="total"
+          @pageChange="pageChange"
+          @pageSizeChange="pageSizeChange"></pagination>
         <el-drawer
           title='查看'
           :visible.sync="historySee"
@@ -599,7 +603,8 @@ export default {
       this.pageNo = page
       this.getTableByPage()
     },
-    pageSizeChange () {
+    pageSizeChange (pageSize) {
+      console.log(pageSize);
       this.getTableByPage()
     },
   },