Merge branch 'develop' into 'FOTON'

Develop

See merge request LAWS/laws-system-front-FOTON!331

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: [],
@@ -2093,6 +2094,7 @@ export default {
       }).then(res => {
         this.verifySarStandard = this.$route.query.verifySarStandard
         let mes = JSON.parse(res.mes)
+        this.submitType = mes.submitType
         mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
         this.roleForm = mes.roleForm
         this.commentText = mes.commentText
@@ -2210,6 +2212,7 @@ export default {
       } // 标准信息
     },
     handleProcessStandardNext(status) {
+      this.submitType = status
       switch (status) {
         // 新增
         case 1:
@@ -3134,7 +3137,7 @@ export default {
         // id: this.id
         taskInfo: '申请人发起',
         form: this.form,
-
+        submitType: this.submitType,
         roleForm: this.roleForm,
         commentText: this.commentText
       }))
@@ -3190,58 +3193,135 @@ 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
+                    json.submitType = this.submitType
+                    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
+                json.submitType = this.submitType
+                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/processCenter/pages/creatProcess/bzrk/step3.vue

@@ -775,6 +775,7 @@ export default {
   name: "bzrkStep3",
   data () {
     return {
+      submitType: '',
       xgdFileMap: [],
       fbgbjbdFileMap: [],
       bpgFileMap: [],
@@ -1072,6 +1073,7 @@ export default {
         }).then(res => {
           if (res) {
             const processForm = JSON.parse(res.mesg)
+            this.submitType = processForm.submitType
             this.xgdFileId = processForm.xgd
             this.fbgbjbdFileId = processForm.fbgbjbd
             this.bpgFileId = processForm.bpg
@@ -1121,7 +1123,6 @@ export default {
     getFormFieldList (item) {
       this.$nextTick(() => {
         this.form = JSON.parse(JSON.stringify(item))
-        console.log("this.form",this.form);
         this.defaultCheckedKeys = [this.form.standSystem]
         this.defaultCheckedKeys1 = [this.form.cycvppsbm]
         this.defaultCheckedKeys2 = [this.form.kccvppsbm]
@@ -1172,7 +1173,8 @@ export default {
         sarAccessInfoListADMIN: this.sarAccessInfoListADMIN,
         bzqdForm: this.bzqdForm,
         listInfo: this.listInfo,
-        id: this.id
+        id: this.id,
+        submitType: this.submitType
       }))
       saveTaskFirst(_formData).then(res => {
         this.saveLoading = false
@@ -1187,6 +1189,7 @@ export default {
       this.form.commentText = this.commentText
       this.form.approvalOpinion = this.approvalOpinion
       const json = JSON.stringify(this.form);
+      json.submitType = this.submitType
       this.$http.post('lawss/activiti/completeTask', {
         taskIds: this.taskIds,
         userId : this.userId,

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

@@ -1568,6 +1568,7 @@ export default {
   },
   data() {
     return {
+      submitType: '',
       modalShowRoleFlag: false,
       fileList: [],
       caFileList: [],
@@ -2584,14 +2585,12 @@ export default {
         }).then(res => {
           if (res) {
             const processForm = JSON.parse(res.mesg)
-            console.log(processForm);
+            this.submitType = processForm.submitType
-            console.log(this.form);
             // this.commentText = processForm.commentText
             if (processForm.form === undefined) {
               this.getFormFieldList(processForm)
             } else {
               //表单文件处理
-              console.log(2);
               this.getFormFieldList(processForm.form)
             }
           }
@@ -2731,6 +2730,7 @@ export default {
         form: this.form,
         roleForm: this.roleForm,
         commentText: this.commentText,
+        submitType: this.submitType,
         // taskInfo: '申请人修订',
         // taskIds:this.taskIds
       }))
@@ -2782,27 +2782,73 @@ export default {
       this.form.country = this.countryArr;
       this.$refs['form'].validate((valid) => {
         if (valid) {
-          this.fileInfoHandle();
+          if (this.submitType === 1) {
-          this.isSubmit = true
+            let standType
-          this.form.commentText = this.commentText
+            if (this.form.standInData === '0') {
-          this.form.approvalOpinion = this.approvalOpinion
+              standType = 'INLAND'
-          const json = JSON.stringify(this.form);
-          this.$http.post('lawss/activiti/completeTask', {
-            taskIds: this.taskIds,
-            userId: this.userId,
-            json: json
-          }, {
-            _this: this
-          }, res => {
-            if (res.success) {
-              this.$message.success(res.message)
-              // 流程提交之后，应该流转至待办任务页面
-              this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
             } else {
-              this.$message.success(res.message)
+              standType = 'FOREIGN'
             }
-            this.isSubmit = false
+            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.commentText = this.commentText
+                this.form.approvalOpinion = this.approvalOpinion
+                const json = JSON.stringify(this.form);
+                json.submitType = this.submitType
+                this.$http.post('lawss/activiti/completeTask', {
+                  taskIds: this.taskIds,
+                  userId: this.userId,
+                  json: json
+                }, {
+                  _this: this
+                }, res => {
+                  if (res.success) {
+                    this.$message.success(res.message)
+                    // 流程提交之后，应该流转至待办任务页面
+                    this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
+                  } else {
+                    this.$message.success(res.message)
+                  }
+                  this.isSubmit = false
+                })
+              } else {
+                this.$message.warning('标准号重复')
+                return
+              }
+            })
+          } else {
+            this.fileInfoHandle();
+            this.isSubmit = true
+            this.form.commentText = this.commentText
+            this.form.approvalOpinion = this.approvalOpinion
+            const json = JSON.stringify(this.form);
+            json.submitType = this.submitType
+            this.$http.post('lawss/activiti/completeTask', {
+              taskIds: this.taskIds,
+              userId: this.userId,
+              json: json
+            }, {
+              _this: this
+            }, res => {
+              if (res.success) {
+                this.$message.success(res.message)
+                // 流程提交之后，应该流转至待办任务页面
+                this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
+              } else {
+                this.$message.success(res.message)
+              }
+              this.isSubmit = false
+            })
+          }
         }
       })
     },

src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue

@@ -106,7 +106,7 @@
                            value-format="yyyy-MM-dd"
             ></el-datePicker>
           </el-form-item>
-          <el-form-item label="标准状态" prop="standStatus" class="add-form-item form-item-disabled">
+          <el-form-item label="制修订类型" prop="standStatus" class="add-form-item form-item-disabled">
             <el-select v-model="form.standStatus" filterable disabled>
               <el-option
                       v-for="item in opinionsStand"

src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue

@@ -90,7 +90,7 @@
             <el-datePicker v-model="form.putTime" :disabled="disabledState"
                            :editable="false"></el-datePicker>
           </el-form-item>
-          <el-form-item label="标准状态" prop="standStatus" class="add-form-item form-item-disabled">
+          <el-form-item label="制修订类型" prop="standStatus" class="add-form-item form-item-disabled">
             <el-select v-model="form.standStatus" filterable :disabled="disabledState">
               <el-option
                       v-for="item in opinionsStand"

src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue

@@ -94,7 +94,7 @@
                     clearable
             ></el-input>
           </el-form-item>
-          <el-form-item label="标准状态" prop="standStatus" class="add-form-item form-item-disabled">
+          <el-form-item label="制修订类型" prop="standStatus" class="add-form-item form-item-disabled">
             <el-select v-model="form.standStatus" filterable clearable :disabled="disabledState" >
               <el-option
                       v-for="item in opinionsStand"

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

@@ -138,7 +138,7 @@
                                                    value-format="yyyy-MM-dd"
                                     ></el-datePicker>
                                 </el-form-item>
-                                <el-form-item label="标准状态" prop="standStatus" class="add-form-item form-item-disabled">
+                                <el-form-item label="制修订类型" prop="standStatus" class="add-form-item form-item-disabled">
                                     <el-select v-model="form.standStatus" filterable clearable>
                                         <el-option
                                                 v-for="item in opinionsStand"
@@ -1429,7 +1429,7 @@
                         {required: true, message: "请选择截止日期", trigger: "change"}
                     ],
                     standStatus: [
-                        { required: true, message: '请选择标准状态', trigger: 'change' }
+                        { required: true, message: '请选择制修订类型', trigger: 'change' }
                     ],
                     standNumber: [
                         { required: true, message: '请输入企标编号', trigger: 'blur' },

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/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -4338,7 +4338,7 @@ export default {
                 type: 'like',
                 value: value
               });
-            }else if (value !== undefined && value !== null && value !== "") {
+            }else if (value !== undefined && value !== null && value !== "" && item.attrField !== 'BARQ') {
               advanceSearchVOList.push({
                 connect: advanceSearchVOList.length > 0 ? "and" : "",
                 field: item.attrField || "",
@@ -4351,7 +4351,7 @@ export default {
             advanceSearchVOList.push({
               connect: "and",
               field: 'BARQ',
-              type: 'equals',
+              type: 'EQUALS',
               value: formData.BARQ
             });
           }

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'}
         ],