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

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

@@ -70,7 +70,7 @@ export default {
       const prcType = row.prcType
       switch(prcType) {
         case '1':
-          if (row.taskInfo === '标准法规业务经理审批') {
+          if (row.taskInfo === '批准') {
             this.$router.push({
               name: 'bzrkStep2',
               query: {
@@ -81,7 +81,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '责任人会签'){
+          }else if (row.taskInfo === '会签'){
             this.$router.push({
               name: 'bzrkStep3',
               query: {
@@ -92,7 +92,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '申请人修订'){
+          }else if (row.taskInfo === '修订'){
             this.$router.push({
               name: 'bzrkStep4',
               query: {

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

@@ -1450,6 +1450,7 @@ export default {
       callback()
     }
     return {
+      submitType: '',
       nodeList3: [],
       fileList: [],
       caFileList: [],
@@ -2210,6 +2211,7 @@ export default {
       } // 标准信息
     },
     handleProcessStandardNext(status) {
+      this.submitType = status
       switch (status) {
         // 新增
         case 1:
@@ -3190,58 +3192,133 @@ export default {
         if (valid) {
           this.$refs['userForm'].validate((valid) => {
             if (valid) {
-              this.fileInfoHandle()
+              if (this.submitType === 1) {
-              this.isSubmit = true
+                let standType
-              this.form.country = this.countryArr;
+                if (this.form.standInData === '0') {
-              var json = Object.assign(this.form, this.roleForm)
+                  standType = 'INLAND'
-              json.zrUserId = this.form.zrUserId
-              json.jlUserId = this.form.jlUserId
-              json.commentText = this.commentText
-              json.applyUpdUserId = this.form.applyUpdUserId
-              json.prcCreateUser = this.form.prcCreateUser
-              json.prcCreateUserName = this.form.prcCreateUserName
-              this.$http.post('lawss/activiti/startProcessRollBack', {
-                createUser: this.$store.getters.userInfo.userId,
-                createUserName: this.$store.getters.userInfo.uName,
-                json: JSON.stringify({
-                  taskInfo: '申请人发起',
-                  form: this.form,
-                  roleForm: this.roleForm,
-                  commentText: this.commentText
-                }),
-                type: '1',
-              }, {
-                _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.isSubmit = false
-                      if (this.bpnId !== '') {
-                        let taskId = {
-                          id: this.bpnId
-                        }
-                        taskDel(taskId).then(res => {
-                          return res
-                        })
-                      }
-                      // 流程提交之后，应该流转至待办任务页面
-                      this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
-                    } else {
-                      this.isSubmit = false
-                    }
-                  })
                 } else {
-                  this.isSubmit = false
+                  standType = 'FOREIGN'
                 }
-              })
+                this.$http.get('sarStandardsInfo/sar-standards-info/checkIsOnly', {
+                  standType: standType,
+                  standSort: this.form.standSort,
+                  standNumber: this.form.standNumber,
+                  standYear: this.form.standYear,
+                }, {
+                  _this: this
+                }, res => {
+                  if (res.ok) {
+                    this.fileInfoHandle()
+                    this.isSubmit = true
+                    this.form.country = this.countryArr;
+                    var json = Object.assign(this.form, this.roleForm)
+                    json.zrUserId = this.form.zrUserId
+                    json.jlUserId = this.form.jlUserId
+                    json.commentText = this.commentText
+                    json.applyUpdUserId = this.form.applyUpdUserId
+                    json.prcCreateUser = this.form.prcCreateUser
+                    json.prcCreateUserName = this.form.prcCreateUserName
+                    this.$http.post('lawss/activiti/startProcessRollBack', {
+                      createUser: this.$store.getters.userInfo.userId,
+                      createUserName: this.$store.getters.userInfo.uName,
+                      json: JSON.stringify({
+                        taskInfo: '申请人发起',
+                        form: this.form,
+                        roleForm: this.roleForm,
+                        commentText: this.commentText
+                      }),
+                      type: '1',
+                    }, {
+                      _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.isSubmit = false
+                            if (this.bpnId !== '') {
+                              let taskId = {
+                                id: this.bpnId
+                              }
+                              taskDel(taskId).then(res => {
+                                return res
+                              })
+                            }
+                            // 流程提交之后，应该流转至待办任务页面
+                            this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
+                          } else {
+                            this.isSubmit = false
+                          }
+                        })
+                      } else {
+                        this.isSubmit = false
+                      }
+                    })
+                  } else {
+                    this.$message.warning('标准号重复')
+                    return
+                  }
+                })
+              } else {
+                this.fileInfoHandle()
+                this.isSubmit = true
+                this.form.country = this.countryArr;
+                var json = Object.assign(this.form, this.roleForm)
+                json.zrUserId = this.form.zrUserId
+                json.jlUserId = this.form.jlUserId
+                json.commentText = this.commentText
+                json.applyUpdUserId = this.form.applyUpdUserId
+                json.prcCreateUser = this.form.prcCreateUser
+                json.prcCreateUserName = this.form.prcCreateUserName
+                this.$http.post('lawss/activiti/startProcessRollBack', {
+                  createUser: this.$store.getters.userInfo.userId,
+                  createUserName: this.$store.getters.userInfo.uName,
+                  json: JSON.stringify({
+                    taskInfo: '申请人发起',
+                    form: this.form,
+                    roleForm: this.roleForm,
+                    commentText: this.commentText
+                  }),
+                  type: '1',
+                }, {
+                  _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.isSubmit = false
+                        if (this.bpnId !== '') {
+                          let taskId = {
+                            id: this.bpnId
+                          }
+                          taskDel(taskId).then(res => {
+                            return res
+                          })
+                        }
+                        // 流程提交之后，应该流转至待办任务页面
+                        this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
+                      } else {
+                        this.isSubmit = false
+                      }
+                    })
+                  } else {
+                    this.isSubmit = false
+                  }
+                })
+              }
             } else {
               this.$message.warning('请检查人员信息表单是否填写完整')
             }

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -213,6 +213,11 @@
                    @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
                     scope.row.standNumber
                   }}-{{ scope.row.standYear }}</a>
+                <a v-else-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '参考' "
+                   class="table-jump" style="color: #98E165"
+                   @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                    scope.row.standNumber
+                  }}-{{ scope.row.standYear }}</a>
                 <a v-else-if="scope.row.standYear" class="table-jump" style="color: #333333"
                    @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
                     scope.row.standNumber
@@ -233,6 +238,10 @@
                    @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{
                     scope.row.standName
                   }}</a>
+                <a v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
+                   @click="handlePreview(scope.row)" class="table-jump" style="color: #98E165">{{
+                    scope.row.standName
+                  }}</a>
                 <a v-else @click="handlePreview(scope.row)" style="color: #333333"
                    class="table-jump">{{ scope.row.standName }}</a>
               </template>
@@ -246,6 +255,9 @@
                 <span
                   v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
                   style="color: #F56C6C">{{ scope.row.issueTime }}</span>
+                <span
+                  v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
+                  style="color: #98E165">{{ scope.row.issueTime }}</span>
                 <span v-else>{{ scope.row.issueTime }}</span>
               </template>
             </el-table-column>
@@ -258,6 +270,9 @@
                 <span
                   v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
                   style="color: #F56C6C">{{ scope.row.SSRQ }}</span>
+                <span
+                  v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
+                  style="color: #98E165">{{ scope.row.SSRQ }}</span>
                 <span v-else>{{ scope.row.SSRQ }}</span>
 
               </template>
@@ -271,6 +286,9 @@
                 <span
                   v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
                   style="color: #F56C6C">{{ scope.row.XCXSSRQ }}</span>
+                <span
+                  v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
+                  style="color: #98E165">{{ scope.row.XCXSSRQ }}</span>
                 <span v-else>{{ scope.row.XCXSSRQ }}</span>
               </template>
             </el-table-column>
@@ -282,6 +300,9 @@
                 <span
                   v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
                   style="color: #F56C6C">{{ scope.row.ZCCSSRQ }}</span>
+                <span
+                  v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
+                  style="color: #98E165">{{ scope.row.ZCCSSRQ }}</span>
                 <span v-else>{{ scope.row.ZCCSSRQ }}</span>
               </template>
             </el-table-column>
@@ -289,6 +310,15 @@
               prop="dtbzh"
               width="200"
               label="代替标准号">
+              <template slot-scope="scope">
+                <span
+                  v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
+                  style="color: #F56C6C">{{ scope.row.dtbzh }}</span>
+                <span
+                  v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
+                  style="color: #98E165">{{ scope.row.dtbzh }}</span>
+                <span v-else>{{ scope.row.dtbzh }}</span>
+              </template>
             </el-table-column>
             <el-table-column
               prop="textStatus"
@@ -304,6 +334,9 @@
                   style="color: #F56C6C">{{
                     textStatusMap[scope.row.textStatus]
                   }}</span>
+                <span
+                  v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
+                  style="color: #98E165">{{ textStatusMap[scope.row.textStatus] }}</span>
                 <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -2385,14 +2385,14 @@ export default {
           {validator: this.verify.testItemCode, trigger: 'change'},
           {type: 'string', max: 20, message: '标准年份/系列不能超过20个字符', trigger: 'change'}
         ],
-        standName: [
+        // standName: [
-          {required: true, message: '标准名称不能为空', trigger: 'change'},
+        //   {required: true, message: '标准名称不能为空', trigger: 'change'},
-          {type: 'string', max: 500, message: '标准名称不能超过500个字符', trigger: 'change'}
+        //   {type: 'string', max: 500, message: '标准名称不能超过500个字符', trigger: 'change'}
-        ],
+        // ],
-        standEnName: [
+        // standEnName: [
-          {type: 'string', max: 1000, message: '标准英文名称不能超过1000个字符', trigger: 'change'},
+        //   {type: 'string', max: 1000, message: '标准英文名称不能超过1000个字符', trigger: 'change'},
-          {validator: this.verify.valiateEnName, trigger: 'blur'}
+        //   {validator: this.verify.valiateEnName, trigger: 'blur'}
-        ],
+        // ],
         synopsis: [
           {type: 'string', max: 1000, message: '文本说明不能超过1000个字符', trigger: 'change'}
         ],