Merge branch 'develop' into FOTON

public/static/pdf/web/viewer.js

@@ -6653,7 +6653,7 @@ var PDFPageView = function () {
           watermark_cols: 0,//水印列数
           watermark_x_space: 18,//水印x轴间隔
           watermark_y_space: 20,//水印y轴间隔
-          watermark_color: 'rgba(192, 192, 192)',//水印字体颜色
+          watermark_color: 'rgba(232,232,240)',//水印字体颜色
           watermark_alpha: 0.3,//水印透明度
           watermark_fontsize: '40px',//水印字体大小
           watermark_font: '微软雅黑',//水印字体
@@ -6671,7 +6671,7 @@ var PDFPageView = function () {
             watermark_cols: 0,//水印列数
             watermark_x_space: 2,//水印x轴间隔
             watermark_y_space: 27,//水印y轴间隔
-            watermark_color: 'rgba(192, 192, 192)',//水印字体颜色
+            watermark_color: 'rgba(232,232,240)',//水印字体颜色
             watermark_alpha: 0.3,//水印透明度
             watermark_fontsize: '40px',//水印字体大小
             watermark_font: '微软雅黑',//水印字体

src/api/unqualProcess.js

@@ -65,7 +65,7 @@ export function meetingByMonth(params) {
 export function addUn(
   closeState,standId, standSerialNumber, standName,
   itemsNum, itemsName, productType,
-  productLine, productName,productId,reason, responsibleUnit,
+  productLine, productName,productId,reason,
   dutyEngineer, authEngineer, qaEngineer, planCloseTime) {
   const data = {
     closeState,
@@ -79,7 +79,6 @@ export function addUn(
     productName, //项目名称
     productId, //项目编号
     reason, //不合规项目
-    responsibleUnit, //责任部门
     dutyEngineer, //责任工程师
     authEngineer, //认证工程师
     qaEngineer, //质量工程师
@@ -96,7 +95,7 @@ export function addUn(
 export function editUn(
   closeState, standId, standSerialNumber, standName,
   itemsNum, itemsName, productType,
-  productLine, productName, reason, responsibleUnit,
+  productLine, productName, reason,
   dutyEngineer, authEngineer, qaEngineer, planCloseTime, id) {
   const data = {
     closeState,
@@ -109,7 +108,6 @@ export function editUn(
     productLine, //产品线
     productName, //项目名称
     reason, //不合规项目
-    responsibleUnit, //责任部门
     dutyEngineer, //责任工程师
     authEngineer, //认证工程师
     qaEngineer, //质量工程师

src/components/navMenu/index.vue

@@ -16,7 +16,7 @@
       <el-menu
               unique-opened
               :default-active="defaultActive"
-              background-color="#4788c0"
+              background-color="#8fb0cc"
               text-color="#fff"
               active-text-color="#000"
               router
@@ -518,11 +518,11 @@
   }
   .el-menu--collapse {
     .is-active {
-      background-color: #697178 !important;
+      background-color: rgb(49, 112, 167) !important;
       .shangqi-icon {
         color: #fff !important;
       }
-      color: #697178 !important;
+      color: rgb(49, 112, 167) !important;
     }
   }
   .nav-menu {
@@ -532,7 +532,7 @@
     user-select: none;
     box-sizing: border-box;
     position: absolute;
-    background: #697178;
+    background: rgb(49, 112, 167);
     background-size: 100% 100%;
     /deep/.el-tooltip {
       padding: 0px 16px !important;
@@ -542,7 +542,7 @@
     }
     &:not(.is-collapse) {
       width: 200px;
-      background: #697178;
+      background: rgb(49, 112, 167);
       background-size: 100% 100%;
       .logo {
         padding: 10px;
@@ -581,7 +581,7 @@
       /*background:url("../../assets/images/shangqi/home/logo3.png");*/
     }
     /deep/:not(.is-collapse) .el-menu-item.is-active{
-      background: #4788c0 !important;
+      background: #8fb0cc !important;
       color: #fff !important;
     }
   }
@@ -614,7 +614,7 @@
     color: #fff;
   }
   .nav-menu{
-    background-color: #697178;
+    background-color: rgb(49, 112, 167);
     scrollbar-width: none;
     -ms-overflow-style: none; /* IE 10+ */
   }
@@ -626,11 +626,11 @@
   }
   .nav-menu-popper .el-menu .el-menu-item.is-active {
     background-color: #fff !important;
-    color: #4788c0 !important;
+    color: #8fb0cc !important;
     font-weight: bold;
   }
   .nav-menu-popper .el-menu .el-menu-item:hover {
-    background-color: #697178 !important;
+    background-color: rgb(49, 112, 167) !important;
     color: #fff !important;
     font-weight: bold;
   }

src/pages/details/otherBussStandardDetails/index.vue

@@ -4,6 +4,7 @@
     <!--title 标题-->
     <div class="details-header">
       <span>{{sarStandardsInfoEO.standCode}} 《{{sarStandardsInfoEO.standName}}》 企标详情</span>
+      <b style="float:right;font-size: 25px;color: #ff9900">{{ ((qualityCommentScore*2*0.9)+(dynamicCommentScore*2*0.1)).toFixed(3) }}</b>
       <!--      之前的，先注掉-->
       <!--      <span>{{sarStandardsInfoEO.standCode}}-{{sarStandardsInfoEO.standYear}} 《{{sarStandardsInfoEO.standName}}》 企标详情</span>-->
     </div>
@@ -1761,6 +1762,7 @@ export default {
         }, res => {
           if (res.ok){
             this.$message.success('提交成功')
+            this.businessCommentDialog = false
             this.commentSubmitLoading = false
             //重新评分之后刷新历史评分人
             let standId = this.$route.params.id
@@ -1777,6 +1779,15 @@ export default {
 
             }, e => {
             })
+            //刷新动态评价总平均分和质量评价总平均分
+            this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, {
+              _this: this
+            }, res => {
+              this.qualityCommentScore = res.data.quality.toFixed(3)/2
+              this.dynamicCommentScore = res.data.dynamic.toFixed(3)/2
+
+            }, e => {
+            })
           }
         }, e => {
         })
@@ -2857,7 +2868,17 @@ export default {
     // }
   },
   async mounted () {
+    //查询动态评价总平均分和质量评价总平均分
     let standId = this.$route.params.id
+    this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, {
+      _this: this
+    }, res => {
+      this.qualityCommentScore = res.data.quality.toFixed(3)/2
+      this.dynamicCommentScore = res.data.dynamic.toFixed(3)/2
+
+    }, e => {
+    })
+    //查询评价人表
     const qualityRequest = {
       lawId: standId,
       evaluationType: 'quality'

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

@@ -56,6 +56,28 @@
                     </div>
                   </div>
                 </el-form-item>
+                <el-form-item label="上传附件" prop="modelNameList" class="add-form-item form-item-disabled">
+                  <el-input
+                          disabled
+                          style="display: none;"
+                          v-model="form.modelNameList"
+                          clearable
+                  ></el-input>
+                  <div v-if="form.modelList.length > 0" class="fileClass" style="display: flex;">
+                    <div v-for="(item, index) in form.modelList" :key="index" @click="fileUpload" style="margin-right: 5px; padding-left: 10px;">
+                      {{ item.name }}
+                    </div>
+                  </div>
+                  <div v-else class="addButton" style="padding-left: 10px">
+                    <el-button
+                            type="primary"
+                            class="common-button-primary"
+                            @click="fileUpload"
+                            size="small">
+                      点击上传
+                    </el-button>
+                  </div>
+                </el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -97,12 +119,12 @@
             <el-timeline-item timestamp="指派责任人" placement="top" :color="roleForm.dockUserList ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="dockUserList" style="margin-bottom: 0">
-                  <h4>责任领导</h4>
+                  <h4>责任部门对接人</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.dockUserList" style="display: none;"/>
                     <el-input
                       v-model="roleForm.dockUserListName"
-                      placeholder="选择责任领导"
+                      placeholder="选择责任部门对接人"
                       @click.native="choiceZRRS">
                     </el-input>
                   </div>
@@ -253,7 +275,7 @@
       </div>
     </el-drawer>
     <Role-tree
-      is-title="选择责任领导"
+      is-title="选择责任部门对接人"
       :is-visible.sync="modalshowflag2"
       @checkedRole="checkedRole2"
       :nodeList="nodeList2"
@@ -297,6 +319,26 @@
         </div>
       </div>
     </el-drawer>
+    <el-dialog width='400px' :visible.sync="fileMadel" title="上传附件">
+      <el-upload
+              multiple
+              class="upload-demo"
+              drag
+              :action="fileUrl"
+              ref="importfile"
+              name="file"
+              accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+              :before-upload="beginImportFile"
+              :on-success="importFileSuccess"
+              :on-remove="importFileRemove"
+              :show-file-list="true"
+      >
+        <div style="padding: 20px 0">
+          <i class="el-icon-upload" style="color: #3399ff"></i>
+          <p>点击或拖拽上传文件</p>
+        </div>
+      </el-upload>
+    </el-dialog>
   </div>
 </template>
 
@@ -311,6 +353,9 @@ export default {
   name: "bzzqyjStep1-1",
   data() {
     return {
+      fileUrl: 'api/att/attFile/upload',
+      fileMadel: false,
+      OCRoptions: [],
       addFjList: [],
       fzShow: false,
       fzlistModel: false,
@@ -330,7 +375,11 @@ export default {
         standType: '',
         standId: '',
         fjList: [],
-        fjListId: ''
+        fjListId: '',
+        fjListId: '',
+        textType: '',
+        modelList: [],
+        modelNameList: ''
       },
       formRules: {
         cid: [
@@ -401,6 +450,11 @@ export default {
     ProcessTitle
   },
   mounted() {
+    this.$http.get('lawss/sarStandAttrDetails/getListData', '', {
+      _this: this
+    }, res => {
+      this.OCRoptions = res.data
+    })
     this.getData()
     this.sarStandCompareHis()
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
@@ -415,6 +469,78 @@ export default {
     }
   },
   methods: {
+    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 === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+        return true
+      } else {
+        this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
+        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
+    },
+    importFileRemove (file, fileList) {
+      let list = ''
+      this.form.modelList = []
+      fileList.forEach(item => {
+        this.form.modelList.push(item)
+        if (list.length > 0) {
+          list += ','
+          list += item.name
+        } else {
+          list+= item.name
+        }
+      })
+      this.form.modelNameList = list
+    },
+    // 导入标准数据成功后执行
+    importFileSuccess (response, file) {
+      if (response.ok) {
+        this.form.modelList.push(response.data)
+        let list = ''
+        this.form.modelList.forEach(item => {
+          if (list.length > 0) {
+            list += ','
+            list += item.name
+          } else {
+            list+= item.name
+          }
+        })
+        this.form.modelNameList = list
+        this.$message({
+          showClose: true,
+          message: response.message,
+          type: 'success'
+        })
+      } else {
+        this.$message.error('程序异常，上传失败')
+      }
+    },
+    fileUpload () {
+      this.fileMadel = true
+    },
+    setWBType(type) {
+      let text = ''
+      for (let a = 0; a < this.OCRoptions.length; a++) {
+        if (this.OCRoptions[a].attrField === type) {
+          text = this.OCRoptions[a].attrName
+        }
+      }
+      return text
+    },
     updataFj(item) {
       let id
       let type = item.fileName.split('.')
@@ -426,15 +552,36 @@ export default {
       window.open('/static/pdf/phone/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
     },
     addfjList() {
-      this.$http.get('lawss/sarStandFile/queryFileInfo', {
+      this.$http.get('lawss/sarStandFile/queryFileInfoNew', {
+        type: '0',
         standId: this.form.standId
-      }, {}, res => {
+      }, {
-        this.fjList = res.data
+        _this: this
+      }, res => {
+        this.OCRLoading = false
+        if (res.ok) {
+          if (res.data.length > 0) {
+            this.fjList = res.data
+            this.fzlistModel = true
+          } else {
+            this.$message.warning('当前标准没有' + text + '文件')
+            this.fjList = []
+          }
+        }
       })
-      this.fzlistModel = true
+      // this.$http.get('lawss/sarStandFile/queryFileInfo', {
+      //   standId: this.form.standId
+      // }, {}, res => {
+      //   this.fjList = res.data
+      //   this.fzlistModel = true
+      // })
     },
     handleSelection2(data) {
-      this.addFjList = data
+      if (data.length > 1) {
+        this.$message.warning('最多选择1条附件')
+      } else {
+        this.addFjList = data
+      }
     },
     closeDrawer2() {
       this.fzlistModel = false
@@ -443,11 +590,16 @@ export default {
     enterDrawer2() {
       this.fzlistModel = false
       this.form.fjList = this.addFjList
-      let idList
+      this.form.textType =  this.setWBType(this.addFjList[0].standFileClassify)
+      this.form.textValue = this.addFjList[0].standFileClassify
+      let idList = []
+      let nameList = []
       this.addFjList.forEach(item => {
-        idList += item.id + ','
+        idList.push(item.id)
+        nameList.push(item.fileName)
       })
-      this.form.fjListId = idList
+      this.form.fjListName = nameList.join(',')
+      this.form.fjListId = idList.join(',')
     },
     // 点击查看
     handlePreview(item) {

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

@@ -56,6 +56,34 @@
                     </div>
                   </div>
                 </el-form-item>
+<!--                <el-form-item label="文本状态" prop="textType" class="add-form-item form-item-disabled">-->
+<!--                  <el-input-->
+<!--                          disabled-->
+<!--                          v-model="form.textType"-->
+<!--                  />-->
+<!--                </el-form-item>-->
+                <el-form-item label="上传附件" prop="modelNameList" class="add-form-item form-item-disabled">
+                  <el-input
+                          disabled
+                          style="display: none;"
+                          v-model="form.modelNameList"
+                          clearable
+                  ></el-input>
+                  <div v-if="form.modelList.length > 0" class="fileClass" style="display: flex;">
+                    <div v-for="(item, index) in form.modelList" :key="index" @click="fileUpload" style="margin-right: 5px; padding-left: 10px;">
+                      {{ item.name }}
+                    </div>
+                  </div>
+                  <div v-else class="addButton" style="padding-left: 10px">
+                      <el-button
+                              type="primary"
+                              class="common-button-primary"
+                              @click="fileUpload"
+                              size="small">
+                        点击上传
+                      </el-button>
+                  </div>
+                </el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -97,12 +125,12 @@
             <el-timeline-item timestamp="指派责任人" placement="top" :color="roleForm.dockUserList ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="dockUserList" style="margin-bottom: 0">
-                  <h4>责任领导</h4>
+                  <h4>责任部门对接人</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.dockUserList" style="display: none;"/>
                     <el-input
                       v-model="roleForm.dockUserListName"
-                      placeholder="选择责任领导"
+                      placeholder="选择责任部门对接人"
                       @click.native="choiceZRRS">
                     </el-input>
                   </div>
@@ -254,7 +282,7 @@
       </div>
     </el-drawer>
     <Role-tree
-      is-title="选择责任领导"
+      is-title="选择责任部门对接人"
       :is-visible.sync="modalshowflag2"
       @checkedRole="checkedRole2"
       :nodeList="nodeList2"
@@ -286,7 +314,15 @@
                 @selection-change="handleSelection2"
                 :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
                 <el-table-column type="selection" width="55" align="center"/>
-                <el-table-column label="附件名" align="center" prop="fileOldName"></el-table-column>
+                <el-table-column label="附件名" align="center" prop="fileName"></el-table-column>
+                <el-table-column
+                        prop="standFileClassify"
+                        label="文本状态"
+                        align="center">
+                  <template slot-scope="scope">
+                    <div>{{ setWBType(scope.row.standFileClassify) }}</div>
+                  </template>
+                </el-table-column>
               </el-table>
             </div>
           </div>
@@ -298,6 +334,26 @@
         </div>
       </div>
     </el-drawer>
+    <el-dialog width='400px' :visible.sync="fileMadel" title="上传附件">
+      <el-upload
+              multiple
+              class="upload-demo"
+              drag
+              :action="fileUrl"
+              ref="importfile"
+              name="file"
+              accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+              :before-upload="beginImportFile"
+              :on-success="importFileSuccess"
+              :on-remove="importFileRemove"
+              :show-file-list="true"
+      >
+        <div style="padding: 20px 0">
+          <i class="el-icon-upload" style="color: #3399ff"></i>
+          <p>点击或拖拽上传文件</p>
+        </div>
+      </el-upload>
+    </el-dialog>
   </div>
 </template>
 
@@ -312,6 +368,9 @@ export default {
   name: "bzzqyjStep1",
   data() {
     return {
+      fileUrl: 'api/att/attFile/upload',
+      fileMadel: false,
+      OCRoptions: [],
       addFjList: [],
       fzShow: false,
       fzlistModel: false,
@@ -332,7 +391,11 @@ export default {
         standId: '',
         fjList: [],
         fjListName: '',
-        fjListId: ''
+        fjListId: '',
+        textValue: '',
+        textType: '',
+        modelList: [],
+        modelNameList: ''
       },
       formRules: {
         cid: [
@@ -401,6 +464,11 @@ export default {
     ProcessTitle
   },
   mounted() {
+    this.$http.get('lawss/sarStandAttrDetails/getListData', '', {
+      _this: this
+    }, res => {
+      this.OCRoptions = res.data
+    })
     this.sarStandCompareHis()
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
       _this: this
@@ -414,6 +482,78 @@ export default {
     }
   },
   methods: {
+    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 === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+        return true
+      } else {
+        this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
+        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
+    },
+    importFileRemove (file, fileList) {
+      let list = ''
+      this.form.modelList = []
+      fileList.forEach(item => {
+        this.form.modelList.push(item)
+        if (list.length > 0) {
+          list += ','
+          list += item.name
+        } else {
+          list+= item.name
+        }
+      })
+      this.form.modelNameList = list
+    },
+    // 导入标准数据成功后执行
+    importFileSuccess (response, file) {
+      if (response.ok) {
+        this.form.modelList.push(response.data)
+        let list = ''
+        this.form.modelList.forEach(item => {
+          if (list.length > 0) {
+            list += ','
+            list += item.name
+          } else {
+            list+= item.name
+          }
+        })
+        this.form.modelNameList = list
+        this.$message({
+          showClose: true,
+          message: response.message,
+          type: 'success'
+        })
+      } else {
+        this.$message.error('程序异常，上传失败')
+      }
+    },
+    fileUpload () {
+      this.fileMadel = true
+    },
+    setWBType(type) {
+      let text = ''
+      for (let a = 0; a < this.OCRoptions.length; a++) {
+        if (this.OCRoptions[a].attrField === type) {
+          text = this.OCRoptions[a].attrName
+        }
+      }
+      return text
+    },
     updataFj(item) {
       let id
       let type = item.fileName.split('.')
@@ -427,14 +567,30 @@ export default {
     addfjList() {
       this.$http.get('lawss/sarStandFile/queryFileInfo', {
         standId: this.form.standId
-      }, {}, res => {
+      }, {
-        this.fjList = res.data
+        _this: this
+      }, res => {
+        this.OCRLoading = false
+        if (res.ok) {
+          if (res.data.length > 0) {
+            this.fjList = res.data
+            this.fzlistModel = true
+          } else {
+            this.$message.warning('当前标准没有文件')
+            this.fjList = []
+          }
+        }
       })
-      this.fzlistModel = true
+      // this.$http.get('lawss/sarStandFile/queryFileInfo', {
+      //   standId: this.form.standId
+      // }, {}, res => {
+      //   this.fjList = res.data
+      //   this.fzlistModel = true
+      // })
     },
     handleSelection2(data) {
-      if (data.length > 5) {
+      if (data.length > 1) {
-        this.$message.warning('最多选择5条附件')
+        this.$message.warning('最多选择1条附件')
       } else {
         this.addFjList = data
       }
@@ -446,6 +602,8 @@ export default {
     enterDrawer2() {
       this.fzlistModel = false
       this.form.fjList = this.addFjList
+      this.form.textType =  this.setWBType(this.addFjList[0].standFileClassify)
+      this.form.textValue = this.addFjList[0].standFileClassify
       let idList = []
       let nameList = []
       this.addFjList.forEach(item => {

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

@@ -46,7 +46,17 @@
                           style="display: none;"
                   ></el-input>
                   <div style="display: flex;">
-                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
+                    <div class="fileClass" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
+                  </div>
+                </el-form-item>
+                <el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
+                  <div v-if="form.modelList.length > 0" style="display: flex;">
+                    <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;" @click="updataFj(item)">
+                      {{ item.name }}
+                    </div>
+                  </div>
+                  <div v-else>
+                    - -
                   </div>
                 </el-form-item>
                 <el-form-item label="责任人" prop="responUserList" class="add-form-item form-item-disabled">
@@ -192,7 +202,10 @@ export default {
         fjList: [],
         fjListId: '',
         responUserList: "",
-        responUserListName: ""
+        responUserListName: "",
+        textType: '',
+        modelList: [],
+        modelNameList: '',
       },
       formRules: {
         responUserList: [
@@ -339,11 +352,14 @@ export default {
           this.form.endTime = data.endTime
           this.form.cname = data.cname
           this.form.fjList = data.fjList
-          this.form.fjListId = data.fjListId
+          // this.form.fjListId = data.fjListId
+          this.form.textType = data.textType
+          this.form.modelList = data.modelList
+          this.form.modelNameList = data.modelNameList
           if (data.fjListId === '') {
             this.form.fjListId = ''
           } else {
-            this.form.fjListId =  data.form.fjListId || data.fjListId
+            this.form.fjListId = data.fjListId || data.form.fjListId
           }
           this.json = data
         }).catch(e => {

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

@@ -46,12 +46,22 @@
                     style="display: none;"
                   ></el-input>
                   <div style="display: flex;">
-                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
+                    <div class="fileClass" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
                       {{ item.fileName }}
                       <el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(item.attId)">下载</el-button>
                     </div>
                   </div>
                 </el-form-item>
+                <el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
+                  <div v-if="form.modelList.length > 0" style="display: flex;">
+                    <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;" @click="updataFj(item)">
+                      {{ item.name }}
+                    </div>
+                  </div>
+                  <div v-else>
+                    - -
+                  </div>
+                </el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -96,6 +106,9 @@
               prop="oldText"
               align="center"
               label="修改前">
+              <template slot-scope="scope">
+                <el-button size="mini" type="primary" :disabled="scope.row.chapterNumber.length === 0" @click="itermsConditionsOpen(scope.row.oldText)" class="common-button-primary">查看修改前内容</el-button>
+              </template>
             </el-table-column>
             <el-table-column
               prop="newText"
@@ -213,6 +226,15 @@
               :is-visible.sync="drawerModal"
               @checkedRole="checkedRole"
       ></Role-tree>
+    <el-dialog
+            title="查看修改前内容"
+            :visible.sync="itermsConditionsFlag"
+            size="800px">
+      <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+      <div slot="footer">
+        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -227,6 +249,8 @@ export default {
   name: "bzzqyjStep4",
   data() {
     return {
+      itermsConditionsFlag: false,
+      itermsConditionsTitle: '',
         drawerModal: false,
       histortData: [],
       data: [],
@@ -254,6 +278,9 @@ export default {
         cname: '', // 名称
         fjList: [],
         fjListId: '',
+        textType: '',
+        modelList: [],
+        modelNameList: '',
       },
       formRules: {
         responUserList: [
@@ -269,6 +296,13 @@ export default {
     ProcessTitle
   },
   methods: {
+    itermsConditionsClose () {
+      this.itermsConditionsFlag = false
+    },
+    itermsConditionsOpen (row) {
+      this.itermsConditionsFlag = true
+      this.itermsConditionsTitle = row
+    },
     downloadFile (attId) {
       window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
     },
@@ -381,7 +415,11 @@ export default {
           this.form.cid = data.cid || data.form.cid
           this.form.endTime = data.endTime || data.form.endTime
           this.form.cname = data.cname || data.form.cname
+          this.form.textType = data.textType
+          this.form.modelList = data.modelList
+          this.form.modelNameList = data.modelNameList
           this.json = data
+          console.log(data);
           this.data = data.info || data.data
         }).catch(e => {
         })

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

@@ -646,6 +646,7 @@
                 v-show="verifySarStandard"
                 show-save
                 show-submit
+                :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
                 @save="handleSave"
                 @submit="handleSubmit"

src/pages/processCenter/pages/creatProcess/qbrk/step9.vue

@@ -1003,6 +1003,7 @@
                 },
                 loading: false,
                 drawerModal: false,
+                taskInfo:'标准法规部部长审核',
                 assigneeNewLoading: false,
                 disabledState: true,
                 userId:this.$store.getters.userInfo.userId,

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue

@@ -188,11 +188,17 @@
                 prop="planStatus"
                 label="计划状态"
                 align="center">
+                <template slot-scope="scope">
+                  <div>{{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }}</div>
+                </template>
               </el-table-column>
               <el-table-column
                 prop="reviseStatus"
                 align="center"
                 label="制修订状态">
+                <template slot-scope="scope">
+                  <div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>
+                </template>
               </el-table-column>
               <el-table-column
                 prop="drafterName"
@@ -354,10 +360,10 @@ export default {
         this.qbfsForm.esName = this.selectList[0].esName
         this.qbfsForm.draftTime = this.selectList[0].draftTime
         this.qbfsForm.drafterName = this.selectList[0].drafterName
-        this.qbfsForm.planStatus = this.selectList[0].planStatus
+        this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定')
         this.qbfsForm.releaseTime = this.selectList[0].releaseTime
         this.qbfsForm.resPersonName = this.selectList[0].resPersonName
-        this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus
+        this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
         this.qbfsForm.unit = this.selectList[0].unit
         this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
         this.ListModel = false

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue

@@ -204,11 +204,17 @@
                prop="planStatus"
                label="计划状态"
                align="center">
+               <template slot-scope="scope">
+                 <div>{{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }}</div>
+               </template>
              </el-table-column>
              <el-table-column
                prop="reviseStatus"
                align="center"
                label="制修订状态">
+               <template slot-scope="scope">
+                 <div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>
+               </template>
              </el-table-column>
              <el-table-column
                prop="drafterName"
@@ -376,10 +382,10 @@ export default {
         this.qbfsForm.esName = this.selectList[0].esName
         this.qbfsForm.draftTime = this.selectList[0].draftTime
         this.qbfsForm.drafterName = this.selectList[0].drafterName
-        this.qbfsForm.planStatus = this.selectList[0].planStatus
+        this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定')
         this.qbfsForm.releaseTime = this.selectList[0].releaseTime
         this.qbfsForm.resPersonName = this.selectList[0].resPersonName
-        this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus
+        this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
         this.qbfsForm.unit = this.selectList[0].unit
         this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
         this.ListModel = false

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue

@@ -23,7 +23,7 @@
             <el-form-item label="计划状态" prop="planStatus1" class="add-form-item form-item-disabled">
               <el-input readonly v-model="qbfsForm.planStatus1" placeholder="请输入计划状态" clearable></el-input>
             </el-form-item>
-            <el-form-item v-show="standShow" label="制修订状态" prop="reviseStatus1" class="add-form-item form-item-disabled">
+            <el-form-item  label="制修订状态" prop="reviseStatus1" class="add-form-item form-item-disabled">
               <el-input readonly v-model="qbfsForm.reviseStatus1" placeholder="请输入制修订状态" clearable></el-input>
             </el-form-item>
           </el-col>
@@ -37,7 +37,7 @@
             <el-form-item label="计划状态" prop="planStatus2" class="add-form-item form-item-disabled">
               <el-input readonly v-model="qbfsForm.planStatus2" placeholder="请输入计划状态" clearable></el-input>
             </el-form-item>
-            <el-form-item v-show="standShow2" label="制修订状态" prop="reviseStatus2" class="add-form-item form-item-disabled">
+            <el-form-item  label="制修订状态" prop="reviseStatus2" class="add-form-item form-item-disabled">
               <el-input readonly v-model="qbfsForm.reviseStatus2" placeholder="请输入制修订状态" clearable></el-input>
             </el-form-item>
           </el-col>
@@ -216,11 +216,17 @@
                 prop="planStatus"
                 label="计划状态"
                 align="center">
+                <template slot-scope="scope">
+                  <div>{{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }}</div>
+                </template>
               </el-table-column>
               <el-table-column
                 prop="reviseStatus"
                 align="center"
                 label="制修订状态">
+                <template slot-scope="scope">
+                  <div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>
+                </template>
               </el-table-column>
               <el-table-column
                 prop="drafterName"
@@ -548,8 +554,8 @@ export default {
         if(this.showType === 'one'){
           this.qbfsForm.esId1 = this.selectList[0].id || '--'
           this.qbfsForm.esName1 = this.selectList[0].esName || '--'
-          this.qbfsForm.planStatus1 = this.selectList[0].planStatus || '--'
+          this.qbfsForm.planStatus1 = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定')
-          this.qbfsForm.reviseStatus1 = this.selectList[0].reviseStatus || '--'
+          this.qbfsForm.reviseStatus1 = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
           this.standShow = true
         }else{
           if(this.qbfsForm.esName1 === this.selectList[0].esName ){
@@ -557,8 +563,8 @@ export default {
           }else{
             this.qbfsForm.esId2 = this.selectList[0].id || '--'
             this.qbfsForm.esName2 = this.selectList[0].esName || '--'
-            this.qbfsForm.planStatus2 = this.selectList[0].planStatus || '--'
+            this.qbfsForm.planStatus2 = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定')
-            this.qbfsForm.reviseStatus2= this.selectList[0].reviseStatus || '--'
+            this.qbfsForm.reviseStatus2 = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
             this.standShow2 = true
           }
         }

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue

@@ -195,11 +195,17 @@
                 prop="planStatus"
                 label="计划状态"
                 align="center">
+                <template slot-scope="scope">
+                  <div>{{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }}</div>
+                </template>
               </el-table-column>
               <el-table-column
                 prop="reviseStatus"
                 align="center"
                 label="制修订状态">
+                <template slot-scope="scope">
+                  <div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>
+                </template>
               </el-table-column>
               <el-table-column
                 prop="drafterName"
@@ -364,10 +370,10 @@ export default {
         this.qbfsForm.esName = this.selectList[0].esName
         this.qbfsForm.draftTime = this.selectList[0].draftTime
         this.qbfsForm.drafterName = this.selectList[0].drafterName
-        this.qbfsForm.planStatus = this.selectList[0].planStatus
+        this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定')
         this.qbfsForm.releaseTime = this.selectList[0].releaseTime
         this.qbfsForm.resPersonName = this.selectList[0].resPersonName
-        this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus
+        this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
         this.qbfsForm.unit = this.selectList[0].unit
         this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
         this.ListModel = false

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue

@@ -92,6 +92,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.mergeReason"
               placeholder="请输入合并原因"
@@ -100,6 +101,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '2'" label="延期后初稿完成时间" prop="yqDraftTime" class="add-form-item form-item-disabled">
             <el-date-picker
+              disabled
               v-model="qbfsForm.yqDraftTime"
               type="date"
               value-format="yyyy-MM-dd"
@@ -108,6 +110,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '2'" label="延期后标准发布时间" prop="yqReleaseTime" class="add-form-item form-item-disabled">
             <el-date-picker
+              disabled
               v-model="qbfsForm.yqReleaseTime"
               type="date"
               value-format="yyyy-MM-dd"
@@ -116,6 +119,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '2'" label="延期原因" prop="delayReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.delayReason"
               placeholder="请输入延期原因"
@@ -124,6 +128,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '3'" label="取消原因" prop="cancelReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.cancelReason"
               placeholder="请输入取消原因"
@@ -132,6 +137,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '4'" label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.renameReason"
               placeholder="请输入更名原因"

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

@@ -92,6 +92,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.mergeReason"
               placeholder="请输入合并原因"
@@ -100,6 +101,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '2'" label="延期后初稿完成时间" prop="yqDraftTime" class="add-form-item form-item-disabled">
             <el-date-picker
+              disabled
               v-model="qbfsForm.yqDraftTime"
               type="date"
               value-format="yyyy-MM-dd"
@@ -108,6 +110,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '2'" label="延期后标准发布时间" prop="yqReleaseTime" class="add-form-item form-item-disabled">
             <el-date-picker
+              disabled
               v-model="qbfsForm.yqReleaseTime"
               type="date"
               value-format="yyyy-MM-dd"
@@ -116,6 +119,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '2'" label="延期原因" prop="delayReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.delayReason"
               placeholder="请输入延期原因"
@@ -124,6 +128,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '3'" label="取消原因" prop="cancelReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.cancelReason"
               placeholder="请输入取消原因"
@@ -132,6 +137,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '4'" label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.renameReason"
               placeholder="请输入更名原因"
@@ -163,7 +169,7 @@
       </div>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"

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

@@ -92,6 +92,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.mergeReason"
               placeholder="请输入合并原因"
@@ -100,6 +101,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '2'" label="延期后初稿完成时间" prop="yqDraftTime" class="add-form-item form-item-disabled">
             <el-date-picker
+              disabled
               v-model="qbfsForm.yqDraftTime"
               type="date"
               value-format="yyyy-MM-dd"
@@ -108,6 +110,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '2'" label="延期后标准发布时间" prop="yqReleaseTime" class="add-form-item form-item-disabled">
             <el-date-picker
+              disabled
               v-model="qbfsForm.yqReleaseTime"
               type="date"
               value-format="yyyy-MM-dd"
@@ -116,6 +119,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '2'" label="延期原因" prop="delayReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.delayReason"
               placeholder="请输入延期原因"
@@ -124,6 +128,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '3'" label="取消原因" prop="cancelReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.cancelReason"
               placeholder="请输入取消原因"
@@ -132,6 +137,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '4'" label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.renameReason"
               placeholder="请输入更名原因"

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

@@ -92,6 +92,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.mergeReason"
               placeholder="请输入合并原因"
@@ -100,6 +101,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '2'" label="延期后初稿完成时间" prop="yqDraftTime" class="add-form-item form-item-disabled">
             <el-date-picker
+              disabled
               v-model="qbfsForm.yqDraftTime"
               type="date"
               value-format="yyyy-MM-dd"
@@ -108,6 +110,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '2'" label="延期后标准发布时间" prop="yqReleaseTime" class="add-form-item form-item-disabled">
             <el-date-picker
+              disabled
               v-model="qbfsForm.yqReleaseTime"
               type="date"
               value-format="yyyy-MM-dd"
@@ -116,6 +119,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '2'" label="延期原因" prop="delayReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.delayReason"
               placeholder="请输入延期原因"
@@ -124,6 +128,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '3'" label="取消原因" prop="cancelReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.cancelReason"
               placeholder="请输入取消原因"
@@ -132,6 +137,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '4'" label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.renameReason"
               placeholder="请输入更名原因"
@@ -163,7 +169,7 @@
       </div>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"

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

@@ -92,6 +92,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.mergeReason"
               placeholder="请输入合并原因"
@@ -100,6 +101,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '2'" label="延期后初稿完成时间" prop="yqDraftTime" class="add-form-item form-item-disabled">
             <el-date-picker
+              disabled
               v-model="qbfsForm.yqDraftTime"
               type="date"
               value-format="yyyy-MM-dd"
@@ -108,6 +110,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '2'" label="延期后标准发布时间" prop="yqReleaseTime" class="add-form-item form-item-disabled">
             <el-date-picker
+              disabled
               v-model="qbfsForm.yqReleaseTime"
               type="date"
               value-format="yyyy-MM-dd"
@@ -116,6 +119,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '2'" label="延期原因" prop="delayReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.delayReason"
               placeholder="请输入延期原因"
@@ -124,6 +128,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '3'" label="取消原因" prop="cancelReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.cancelReason"
               placeholder="请输入取消原因"
@@ -132,6 +137,7 @@
           </el-form-item>
           <el-form-item  v-if="type === '4'" label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
             <el-input
+              disabled
               type="textarea"
               v-model="qbfsForm.renameReason"
               placeholder="请输入更名原因"
@@ -163,7 +169,7 @@
       </div>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"

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

@@ -206,10 +206,6 @@
             align="center"
             label="在产车实施日期">
           </el-table-column>
-          <el-table-column
-            prop="productType"
-            align="center"
-            label="在研产品">
             <el-table-column
               prop="complianceReasons"
               align="center"
@@ -243,43 +239,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
             fixed="right"
             align="center"

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

@@ -142,12 +142,12 @@
         </div>
         <el-table
           ref="multipleTable"
-          :data="listForm.breakdownList"
+          :data="listForm.breakdownList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
-          tooltip-effect="dark"
+          style="width: 100%; border: 1px solid #cccccc;height: 400px"
-          style="width: 100%"
+          height="48%"
           border
+          highlight-current-row
           @selection-change="selectStandChange"
-          :height="sarProStateTableHeight"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
              fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
           <el-table-column
@@ -158,46 +158,55 @@
           <el-table-column
             prop="productLine"
             align="center"
+            width="150"
             label="产品线">
           </el-table-column>
           <el-table-column
             prop="projectNumber"
             align="center"
+            width="160px"
             label="项目编号">
           </el-table-column>
           <el-table-column
             prop="projectName"
             align="center"
+            min-width="300"
             label="项目名称">
           </el-table-column>
           <el-table-column
             prop="itemNum"
             align="center"
+            width="100px"
             label="条款号">
           </el-table-column>
           <el-table-column
             prop="itemsName"
             align="center"
+            width="160px"
             label="条款名称">
           </el-table-column>
           <el-table-column
             prop="technicalRequir"
             align="center"
+            width="160px"
             label="核心技术要求/变化点">
           </el-table-column>
           <el-table-column
             prop="changePoint"
             align="center"
+            width="160px"
             label="基于上一版本差异">
           </el-table-column>
           <el-table-column
             prop="xcxssrq"
             align="center"
+            width="120px"
             label="新车型实施日期">
           </el-table-column>
           <el-table-column
             prop="zccssrq"
             align="center"
+            width="120px"
             label="在产车实施日期">
           </el-table-column>
           <el-table-column
@@ -211,7 +220,14 @@
             </template>
           </el-table-column>
         </el-table>
-
+        <el-pagination
+          layout="total,sizes, prev, pager, next"
+          background
+          :page-sizes="[20, 40, 60]"
+          :total="total"
+          @current-change="handleCurrentChange"
+        >
+        </el-pagination>
         <!--    选择责任人-->
         <Role-tree
           is-title="选择落实人"
@@ -330,6 +346,7 @@ export default {
     return {
       //折叠的标志，true为折叠，false为不折叠
       foldFormFlag: false,
+      currentPage: 1,
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,
@@ -360,6 +377,7 @@ export default {
       tabValue: "listOfCountries",
       selectedList: [],  //选择清单的选择框
       selectList: [], //选择标准的选择框
+      selectStandList: [], //点开批量弹窗选择数据丢失
       lsIndex: "",
       lsType: "",
       bringData: [],
@@ -498,6 +516,10 @@ export default {
       });
       window.open(routeUrl.href, "_blank");
     },
+    // 分页
+    handleCurrentChange(currentPage) {
+      this.currentPage = currentPage;
+    },
     getData() {
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
@@ -555,6 +577,7 @@ export default {
               xcxssrq: item.pepdtos[i].XCXSSRQ,
               zccssrq: item.pepdtos[i].ZCCSSRQ
             });
+            this.total = this.listForm.breakdownList.length
           }
         }
       } else {
@@ -579,7 +602,7 @@ export default {
         this.listForm.breakdownList[this.lsIndex].implementer = nameList;
       } else if (this.type === 2) {
         this.listForm.breakdownList.forEach(item => {
-          this.selectList.forEach(items => {
+          this.selectStandList.forEach(items => {
             if (item === items) {
               item.implementerId = idList;
               item.implementer = nameList;
@@ -594,6 +617,7 @@ export default {
       this.modalshowflag = false;
     },
     choiceZRRS(row, type, index) {
+     this.selectStandList = this.selectList
       this.type = type;
       if (type === 1) {
         this.drawerTitle = "选择责任人";
@@ -653,14 +677,13 @@ export default {
     },
     //提交事件
     handleSubmit() {
+      let standList = []
       this.listForm.breakdownList.forEach(item => {
-        if (item.implementer === null || item.implementer === "" || item.implementer === undefined) {
+        if (item.implementer) {
-          this.sarFlag = false;
+          standList.push(item)
-        } else {
-          this.sarFlag = true;
         }
       });
-      if (this.sarFlag === true) {
+        this.listForm.breakdownList = standList
         this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
         this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
         this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
@@ -684,9 +707,6 @@ export default {
           this.isSubmit = false;
         }, e => {
         });
-      } else {
-        this.$message.warning("请选择落实人");
-      }
     },
     drawerCheck(data) {
       var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
@@ -699,6 +719,7 @@ export default {
     },
     //标准表格选择框改变
     selectStandChange(data) {
+      console.log(data);
       this.selectList = data;
     },
     selectThree() {

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

@@ -598,47 +598,48 @@ export default {
       })
       if(!fileFlag){
         this.$message.warning('请选择分解单来源')
+      }else{
+        if (this.listForm.dataList.length < 1) {
+          this.$message.warning("请选择带标准的项目");
+        } else {
+          this.listForm.commentText = this.commentText;
+          var json = Object.assign(this.listForm, this.roleForm);
+          json.prcCreateUser = this.$store.getters.userInfo.userId;
+          json.prcCreateUserName = this.$store.getters.userInfo.userName;
+          json.standId = this.listForm.standId;
+          this.$refs["listForm"].validate((valid) => {
+            if (valid) {
+              this.$refs["roleForm"].validate((valid) => {
+                if (valid) {
+                  this.isSubmit = true;
+                  this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
+                    _this: this
+                  }, res => {
+                    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) {
+                          this.$message.success(res.message);
+                          this.$router.push("/processCenter");
+                        }
+                        this.isSubmit = false;
+                      });
+                    }
+                  });
+                } else {
+                  return this.$message.warning("请完善人员信息");
+                }
+              });
+            } else {
+              return this.$message.warning("请完善基础信息");
+            }
+          });
       }
-      if (this.listForm.dataList.length < 1) {
-        this.$message.warning("请选择带标准的项目");
-      } else {
-        this.listForm.commentText = this.commentText;
-        var json = Object.assign(this.listForm, this.roleForm);
-        json.prcCreateUser = this.$store.getters.userInfo.userId;
-        json.prcCreateUserName = this.$store.getters.userInfo.userName;
-        json.standId = this.listForm.standId;
-        this.$refs["listForm"].validate((valid) => {
-          if (valid) {
-            this.$refs["roleForm"].validate((valid) => {
-              if (valid) {
-                this.isSubmit = true;
-                this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
-                  _this: this
-                }, res => {
-                  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) {
-                        this.$message.success(res.message);
-                        this.$router.push("/processCenter");
-                      }
-                      this.isSubmit = false;
-                    });
-                  }
-                });
-              } else {
-                return this.$message.warning("请完善人员信息");
-              }
-            });
-          } else {
-            return this.$message.warning("请完善基础信息");
-          }
-        });
       }
     },
     choiceZRR(type, title, id) {

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

@@ -615,47 +615,48 @@ export default {
         })
       if(!fileFlag){
          this.$message.warning('请选择分解单来源')
+      }else{
+        if (this.listForm.dataList.length < 1) {
+          this.$message.warning("请选择带标准的项目");
+        } else {
+          this.listForm.commentText = this.commentText;
+          var json = Object.assign(this.listForm, this.roleForm);
+          json.prcCreateUser = this.$store.getters.userInfo.userId;
+          json.prcCreateUserName = this.$store.getters.userInfo.userName;
+          json.standId = this.listForm.standId;
+          this.$refs["listForm"].validate((valid) => {
+            if (valid) {
+              this.$refs["roleForm"].validate((valid) => {
+                if (valid) {
+                  this.isSubmit = true;
+                  this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
+                    _this: this
+                  }, res => {
+                    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) {
+                          this.$message.success(res.message);
+                          this.$router.push("/processCenter");
+                        }
+                        this.isSubmit = false;
+                      });
+                    }
+                  });
+                } else {
+                  return this.$message.warning("请完善人员信息");
+                }
+              });
+            } else {
+              return this.$message.warning("请完善基础信息");
+            }
+          });
       }
-      if (this.listForm.dataList.length < 1) {
-        this.$message.warning("请选择带标准的项目");
-      } else {
-        this.listForm.commentText = this.commentText;
-        var json = Object.assign(this.listForm, this.roleForm);
-        json.prcCreateUser = this.$store.getters.userInfo.userId;
-        json.prcCreateUserName = this.$store.getters.userInfo.userName;
-        json.standId = this.listForm.standId;
-        this.$refs["listForm"].validate((valid) => {
-          if (valid) {
-            this.$refs["roleForm"].validate((valid) => {
-              if (valid) {
-                this.isSubmit = true;
-                this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
-                  _this: this
-                }, res => {
-                  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) {
-                        this.$message.success(res.message);
-                        this.$router.push("/processCenter");
-                      }
-                      this.isSubmit = false;
-                    });
-                  }
-                });
-              } else {
-                return this.$message.warning("请完善人员信息");
-              }
-            });
-          } else {
-            return this.$message.warning("请完善基础信息");
-          }
-        });
       }
     },
     // 点击查看

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

@@ -121,10 +121,6 @@
             align="center"
             label="在产车实施日期">
           </el-table-column>
-          <!--          <el-table-column-->
-          <!--            prop="productType"-->
-          <!--            align="center"-->
-          <!--            label="在研产品">-->
           <el-table-column
             prop="researchCompliance"
             align="center"
@@ -224,115 +220,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="scope.row.zcNoCompliance && scope.row.zcNoCompliance.length>0-->
-          <!--                    || scope.row.zcCountermeasures && scope.row.zcCountermeasures>0-->
-          <!--                    || scope.row.zcCompletionTime && scope.row.zcCompletionTime !== null"-->
-          <!--                    disabled-->
-          <!--                  v-model="scope.row.zcComplianceReasons"-->
-          <!--                  placeholder="请输入合规原因"-->
-          <!--                >-->
-          <!--                </el-input>-->
-          <!--                <el-input-->
-          <!--                    v-else-->
-          <!--                    v-model="scope.row.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="scope.row.zcComplianceReasons && scope.row.zcComplianceReasons.length>0"-->
-          <!--                      disabled-->
-          <!--                    v-model="scope.row.zcNoCompliance"-->
-          <!--                    placeholder="请输入不合规项目"-->
-          <!--                  >-->
-          <!--                  </el-input>-->
-          <!--                  <el-input-->
-          <!--                      v-else-->
-          <!--                      v-model="scope.row.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="scope.row.zcComplianceReasons && scope.row.zcComplianceReasons.length>0"-->
-          <!--                      disabled-->
-          <!--                    v-model="scope.row.zcCountermeasures"-->
-          <!--                    placeholder="请输入应对措施"-->
-          <!--                  >-->
-          <!--                  </el-input>-->
-          <!--                  <el-input-->
-          <!--                      v-else-->
-          <!--                      v-model="scope.row.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="scope.row.zcComplianceReasons && scope.row.zcComplianceReasons.length>0"-->
-          <!--                      disabled-->
-          <!--                    v-model="scope.row.zcCompletionTime"-->
-          <!--                    type="date"-->
-          <!--                    placeholder="请选择日期">-->
-          <!--                  </el-date-picker>-->
-          <!--                  <el-date-picker-->
-          <!--                      v-else-->
-          <!--                      class="datePickLen"-->
-          <!--                      clearable-->
-          <!--                      v-model="scope.row.zcCompletionTime"-->
-          <!--                      type="date"-->
-          <!--                      placeholder="请选择日期">-->
-          <!--                  </el-date-picker>-->
-          <!--                </template>-->
-          <!--              </el-table-column>-->
-          <!--            </el-table-column>-->
-          <!--          </el-table-column>-->
-          <!--          以后全选可能用-->
-          <!--          <el-table-column-->
-          <!--              prop="productionCompletionTime"-->
-          <!--              align="center"-->
-          <!--              fixed="right"-->
-          <!--              width="160"-->
-          <!--              label="操作">-->
-          <!--            <template slot-scope="scope">-->
-          <!--              <el-button style="width: 98%" size="small" type="primary" @click="">{{ "批量编辑" }}</el-button>-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
         </el-table>
         <el-pagination
           layout="total,sizes, prev, pager, next"

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

@@ -581,7 +581,7 @@ export default {
           }
           break;
         case '3':
-          if (row.taskInfo === '责任对接人选择责任人') {
+          if (row.taskInfo === '责任部门对接人选择责任人') {
             this.$router.push({
               name: 'bzzqyjStep2',
               query: {
@@ -592,7 +592,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '责任人填写征求意见'){
+          } else if (row.taskInfo === '责任人反馈'){
             this.$router.push({
               name: 'bzzqyjStep3',
               query: {
@@ -603,7 +603,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '责任对接人审批') {
+          } else if (row.taskInfo === '责任部门对接人汇总并选择审批人') {
             this.$router.push({
               name: 'bzzqyjStep4',
               query: {

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue

@@ -357,50 +357,45 @@
             </el-table-column>
             <el-table-column
               prop="issueTime"
-              sortable="custom"
               width="120"
               label="发布日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.issueTime }}</span>
-                <span v-else>{{ formatIssueDate(scope.row.issueTime) }}</span>
+                <span v-else>{{ scope.row.issueTime }}</span>
               </template>
             </el-table-column>
             <el-table-column
               prop="ssrq"
-              sortable="custom"
               width="120"
               label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.ssrq }}</span>
-                <span v-else>{{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.ssrq }}</span>
 
               </template>
             </el-table-column>
 
             <el-table-column
               prop="xcxssrq"
-              sortable="custom"
               width="150"
               label="新车型实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.xcxssrq }}</span>
-                <span v-else>{{ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.xcxssrq }}</span>
               </template>
             </el-table-column>
             <el-table-column
               prop="zccssrq"
-              sortable="custom"
               width="150"
               label="在产车实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.zccssrq }}</span>
-                <span v-else>{{ scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.zccssrq }}</span>
               </template>
             </el-table-column>
             <el-table-column
               prop="textStatus"
-              sortable="custom"
               width="110"
               label="文本状态">
               <!--              <template slot="header" slot-scope="scope">-->
@@ -455,77 +450,90 @@
                   }}</a>
               </template>
             </el-table-column>
+            <el-table-column
+                show-overflow-tooltip
+                prop="standEnName"
+                label="英文名称"
+                min-width="300"
+            >
+              <template slot-scope="scope">
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standEnName
+                  }}</a>
+                <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standEnName
+                  }}</a>
+                <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standEnName
+                  }}</a>
+              </template>
+            </el-table-column>
             <el-table-column
               prop="issueTime"
-              sortable="custom"
               width="120"
               label="发布日期">
               <template slot-scope="scope">
                 <div v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">
-                  {{ formatIssueDate(scope.row.issueTime) }}
+                  {{ scope.row.issueTime }}
                 </div>
                 <div v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">
-                  {{ formatIssueDate(scope.row.issueTime) }}
+                  {{ scope.row.issueTime }}
                 </div>
                 <div v-else style="color: #333333">
-                  {{ formatIssueDate(scope.row.issueTime) }}
+                  {{ scope.row.issueTime }}
                 </div>
               </template>
             </el-table-column>
             <el-table-column
               prop="ssrq"
-              sortable="custom"
               width="120"
               label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
                 <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
-                    scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-'
+                    scope.row.ssrq
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
-                    scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-'
+                    scope.row.ssrq
                   }}</span>
-                <span v-else style="color: #333333">{{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }}</span>
+                <span v-else style="color: #333333">{{ scope.row.ssrq}}</span>
 
               </template>
             </el-table-column>
             <el-table-column
               prop="xcxssrq"
-              sortable="custom"
               width="150"
               label="新车型实施日期">
               <template slot-scope="scope">
                 <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
-                    scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-'
+                    scope.row.xcxssrq
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
-                    scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-'
+                    scope.row.xcxssrq
                   }}</span>
                 <span v-else style="color: #333333">{{
-                    scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-'
+                    scope.row.xcxssrq
                   }}</span>
               </template>
             </el-table-column>
             <el-table-column
               prop="zccssrq"
-              sortable="custom"
               width="150"
               label="在产车实施日期">
               <template slot-scope="scope">
                 <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
-                    scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-'
+                    scope.row.zccssrq
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
-                    scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-'
+                    scope.row.zccssrq
                   }}</span>
                 <span v-else style="color: #333333">{{
-                    scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-'
+                    scope.row.zccssrq
                   }}</span>
               </template>
             </el-table-column>
             <el-table-column
               prop="textStatus"
-              sortable="custom"
               width="110"
               label="文本状态">
               <!--              <template slot="header" slot-scope="scope">-->
@@ -584,30 +592,27 @@
             <el-table-column
                 prop="issueTime"
                 label="发文日期"
-                sortable
                 width="120"
             >
               <template slot-scope="scope">
-                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.issueTime }}</span>
-                <span v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C">{{scope.row.issueTime }}</span>
-                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.issueTime }}</span>
               </template>
             </el-table-column>
             <el-table-column
                 prop="XCXSSRQLAWS"
                 label="新车实施日期"
-                sortable
                 width="150"
             >
               <template slot-scope="scope">
-                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.putTime }}</span>
-                <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">{{scope.row.putTime }}</span>
-                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.XCXSSRQLAWS ? scope.row.XCXSSRQLAWS.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.XCXSSRQLAWS }}</span>
               </template>
             </el-table-column>
             <el-table-column
                 show-overflow-tooltip
-                sortable
                 prop="standStatusShow"
                 label="文本状态"
                 width="110"
@@ -666,30 +671,27 @@
             <el-table-column
                 prop="issueTime"
                 label="发布日期"
-                sortable
                 width="120"
             >
               <template slot-scope="scope">
-                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.issueTime }}</span>
-                <span v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C">{{scope.row.issueTime }}</span>
-                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.issueTime }}</span>
               </template>
             </el-table-column>
             <el-table-column
                 prop="putTime"
                 label="实施日期"
-                sortable
                 width="120"
             >
               <template slot-scope="scope">
-                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.putTime }}</span>
-                <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">{{scope.row.putTime }}</span>
-                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.putTime }}</span>
               </template>
             </el-table-column>
             <el-table-column
                 show-overflow-tooltip
-                sortable
                 prop="standStatusShow"
                 label="文本状态"
                 width="110"
@@ -712,7 +714,6 @@
         </el-table>
         <!--分页-->
         <pagination
-            v-show="this.lawInfoTableLoading === false"
             style="position: relative;"
             :page="handleSelectForm.page"
             :total="handleSelectForm.total"

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -2809,7 +2809,7 @@ export default {
               this.OCRData = res.data
             } else {
               this.$message.warning('当前标准没有' + text + '文件')
-              this.this.OCRData = []
+              this.OCRData = []
             }
           }
         })

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -226,6 +226,24 @@
                   }}</a>
               </template>
             </el-table-column>
+            <el-table-column
+                show-overflow-tooltip
+                prop="standEnName"
+                label="英文名称"
+                min-width="300"
+            >
+              <template slot-scope="scope">
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standEnName
+                  }}</a>
+                <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standEnName
+                  }}</a>
+                <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standEnName
+                  }}</a>
+              </template>
+            </el-table-column>
             <el-table-column
               prop="issueTime"
               sortable="custom"

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

@@ -250,7 +250,7 @@
                   <div class="seeItem">{{ historySeeForm.responsibleUnit }}</div>
                 </el-form-item>
                 <el-form-item class="add-form-item" label="责任工程师:">
-                  <div class="seeItem">{{ historySeeForm.dutyEngineer }}</div>
+                  <div class="seeItem">{{ historySeeForm.dutyEngineerName }}</div>
                 </el-form-item>
                 <el-form-item class="add-form-item" label="认证工程师:">
                   <div class="seeItem">{{ historySeeForm.authEngineer }}</div>
@@ -418,8 +418,9 @@
                   <el-form-item prop="standSerialNumber" label="标准号" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
                     <el-input
+                      readonly
                       v-model="addForm.standSerialNumber"
-                      placeholder="请输入标准名称"
+                      placeholder="请输入标准号"
                     />
                     <el-button
                       type="primary"
@@ -432,7 +433,7 @@
                   <el-form-item prop="standName" label="标准名称" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
                     <el-input
-                      :disabled="true"
+                      readonly
                       v-model="addForm.standName"
                       placeholder="请输入标准名称"
                     />
@@ -487,14 +488,14 @@
                       placeholder="请输入项目编号"
                     />
                   </el-form-item>
-                  <el-form-item prop="responsibleUnit" label="责任部门" style="width: 100%; margin-right:10px"
+<!--                  <el-form-item prop="responsibleUnit" label="责任部门" style="width: 100%; margin-right:10px"-->
-                                class="add-form-item">
+<!--                                class="add-form-item">-->
-                    <el-input
+<!--                    <el-input-->
-                      v-model="addForm.responsibleUnit"
+<!--                      v-model="addForm.responsibleUnit"-->
-                      placeholder="请输入责任部门"
+<!--                      placeholder="请输入责任部门"-->
-                      @click.native="choiceZRBM"
+<!--                      @click.native="choiceZRBM"-->
-                    />
+<!--                    />-->
-                  </el-form-item>
+<!--                  </el-form-item>-->
                   <el-form-item prop="reason" label="不合规项目" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
                     <el-input
@@ -502,10 +503,10 @@
                       placeholder="请输入不合规项目"
                       :maxlength="500" />
                   </el-form-item>
-                  <el-form-item prop="dutyEngineer" label="责任工程师" style="width: 100%; margin-right:10px"
+                  <el-form-item prop="dutyEngineerName" label="责任工程师" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
                     <el-input
-                      v-model="addForm.dutyEngineer"
+                      v-model="addForm.dutyEngineerName"
                       placeholder="请输入责任工程师"
                       @click.native="choiceZRR"
                     />
@@ -775,22 +776,22 @@ export default {
       }, //表单数据
       formRules: {
         standSerialNumber: [
-          { required: true, message: "请输入标准号", trigger: "blur" }
+          { required: true, message: "请输入标准号", trigger: "change" }
         ],
         standName: [
-          { required: true, message: "请输入标准名称", trigger: "blur" }
+          { required: true, message: "请输入标准名称", trigger: "change" }
+        ],
+        itemsNum: [
+          { required: true, message: "请输入条款号", trigger: "change" }
+        ],
+        itemsName: [
+          { required: true, message: "请输入条款名称", trigger: "change" }
         ],
-        // itemsNum: [
-        //   { required: true, message: "请输入条款号", trigger: "blur" }
-        // ],
-        // itemsName: [
-        //   { required: true, message: "请输入条款名称", trigger: "blur" }
-        // ],
         productType: [
-          { required: true, message: "请输入产品类型", trigger: "blur" }
+          { required: true, message: "请输入产品类型", trigger: "change" }
         ],
         productLine: [
-          { required: true, message: "请输入产品线", trigger: "blur" }
+          { required: true, message: "请输入产品线", trigger: "change" }
         ],
         productName: [
           { required: true, message: "请输入项目名称", trigger: "change" }
@@ -799,16 +800,16 @@ export default {
           { required: true, message: "请输入项目编号", trigger: "change" }
         ],
         reason: [
-          { required: true, message: "请输入不合规项目", trigger: "blur" }
+          { required: true, message: "请输入不合规项目", trigger: "change" }
-        ],
-        responsibleUnit: [
-          { required: true, message: "请输入责任部门", trigger: "blur" }
         ],
+        // responsibleUnit: [
+        //   { required: true, message: "请输入责任部门", trigger: "change" }
+        // ],
         dutyEngineerName: [
-          { required: true, message: "请输入责任工程师", trigger: "blur" }
+          { required: true, message: "请输入责任工程师", trigger: "change" }
         ],
         planCloseTime: [
-          { required: true, message: "请选择计划关闭时间", trigger: "blur" }
+          { required: true, message: "请选择计划关闭时间", trigger: "change" }
         ]
       },
       drawerTable: false, //表单模态窗
@@ -907,15 +908,18 @@ export default {
     },
     //确认添加标准
     okStand(){
-      if(this.standList > 1){
+      if(this.standList.length > 1){
         this.$message.warning('您只能选择一条标准进行添加')
-      }else if(this.standList < 1){
+      }else if(this.standList.length < 1){
         this.$message.warning('请至少选择一条数据进行添加')
       }else{
         this.addForm.standId = this.standList[0].id
         this.addForm.standName = this.standList[0].standName
         this.addForm.standSerialNumber = this.standList[0].standSort + '-' + this.standList[0].standNumber + '-' + this.standList[0].standYear
         this.dialogTableVisible = false
+        if(this.addForm.standName){
+          this.$refs.addForm.validateField('standName');
+        }
       }
     },
     //添加标准select的改变
@@ -1094,7 +1098,7 @@ export default {
       const productName = this.addForm.productName;
       const productId = this.addForm.productId;
       const reason = this.addForm.reason;
-      const responsibleUnit = this.addForm.responsibleUnit;
+      // const responsibleUnit = this.addForm.responsibleUnit;
       const dutyEngineer = this.addForm.dutyEngineer;
       const authEngineer = this.addForm.authEngineer;
       const qaEngineer = this.addForm.qaEngineer;
@@ -1107,7 +1111,7 @@ export default {
               closeState, standId, standSerialNumber,
               standName, itemsNum, itemsName, productType,
               productLine, productName, productId,reason,
-              responsibleUnit, dutyEngineer,
+              dutyEngineer,
               authEngineer, qaEngineer, planCloseTime).then(res => {
               if (res.ok) {
                 this.submiting = false
@@ -1128,7 +1132,7 @@ export default {
             editUn(
               closeState, standId, standSerialNumber,
               standName, itemsNum, itemsName, productType,
-              productLine, productName, reason, responsibleUnit,
+              productLine, productName, reason,
               dutyEngineer, authEngineer, qaEngineer,
               planCloseTime, id).then(res => {
               if (res.ok) {
@@ -1197,8 +1201,8 @@ export default {
       this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1", {
         standType: this.standardSearch.standType,
         standNumber: this.standardSearch.standNumber,
-        page: this.pageNo,
+        page: this.page,
-        pageSize: this.pageSizeNo
+        pageSize: this.pageSize
       }, {
         _this: this
       }, res => {
@@ -1258,13 +1262,24 @@ export default {
       let routeUrl = this.$router.resolve({
         name: "OtherStandardDetails",
         params: {
-          id: item.standId,
+          id: item.id,
-          pageType: "FOREIGN_STAND"
+          pageType: "INLAND_STAND"
-          // pageType: item.standType + '_STAND'
         }
       });
       window.open(routeUrl.href, "_blank");
     },
+    // 点击查看
+    // handlePreview(item) {
+    //   let routeUrl = this.$router.resolve({
+    //     name: "OtherStandardDetails",
+    //     params: {
+    //       id: item.standId,
+    //       pageType: "FOREIGN_STAND"
+    //       // pageType: item.standType + '_STAND'
+    //     }
+    //   });
+    //   window.open(routeUrl.href, "_blank");
+    // },
     detailsStandard(item) {
       this.$http.post("lawss/sarTestItem/validateStandNumber", {
         standNumber: item.standNum
@@ -1341,13 +1356,21 @@ export default {
       this.roleShowflag = true
     },
     drawerCheck(data) {
-      this.addForm.dutyEngineer = data[0].name
+      // this.addForm.dutyEngineer = data[0].id
+      // this.addForm.dutyEngineerName = data[0].name
+      this.$set(this.addForm, 'dutyEngineer', data[0].id)
+      this.$set(this.addForm, 'dutyEngineerName', data[0].name)
+      if(this.addForm.dutyEngineerName){
+        this.$refs.addForm.validateField('dutyEngineerName');
+      }
       this.roleShowflag = false
     },
     /** 选择认证工程师和质量工程师 */
     choiceMore(type, title, id) {
       this.nodeListMore = []
-      this.nodeListMore.push(id)
+      if(id){
+        this.nodeListMore.push(id)
+      }
       this.type = type
       this.titleMore = title
       this.roleShowMore = true
@@ -1365,6 +1388,7 @@ export default {
       })
       if (this.type === 'authEngineer') {
         this.addForm.authEngineer = nameList
+        console.log(this.addForm.authEngineer);
       } else {
         this.addForm.qaEngineer = nameList
       }