From 9bc1166dfa350892997d7c23df956e1d97951ab4 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Thu, 16 Dec 2021 14:40:12 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=92=A4=E9=94=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/process.js                             |  8 ++++++++
 .../pages/creatProcess/bzhHd-rh/step1.vue      | 17 ++++++++++++-----
 .../pages/creatProcess/bzhHy-ch/step1.vue      | 18 +++++++++++++-----
 .../pages/creatProcess/wfhxzg/step1.vue        | 17 ++++++++++++-----
 4 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/src/api/process.js b/src/api/process.js
index 87fc515ef..414496639 100644
--- a/src/api/process.js
+++ b/src/api/process.js
@@ -689,6 +689,14 @@ export function getStandInfoById (data) {
     params: data
   })
 }
+// 流程撤回接口
+export function processBack(data) {
+  return axios({
+    url: 'api/lawss/activiti/startProcessRollBack',
+    method: 'post',
+    data
+  })
+}
 // 标准法规工作组接口
 export function workGroup(data) {
   return axios({
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
index 946f33d86..792560783 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
@@ -395,7 +395,7 @@ import ProcessTitle from '../../components/ProcessTitle'
 import {
   startProcess, saveTaskFirst,
   completeTask, queryTaskFirst,
-  taskDel, workGroup
+  taskDel, workGroup,processBack
 } from '@/api/process.js'
 
 export default {
@@ -742,10 +742,17 @@ export default {
           this.$refs['roleForm'].validate((valid) => {
             if (valid) {
               this.isSubmit = true
-              const paramsInfo = {
-                type: '20'
-              }
-              startProcess(paramsInfo).then(res => {
+              let paramsInfo = new FormData()
+              paramsInfo.append('id', this.bpnId || '')
+              paramsInfo.append('createUser', this.$store.getters.userInfo.userId)
+              paramsInfo.append('createUserName', this.$store.getters.userInfo.userName)
+              paramsInfo.append('type', '20')
+              paramsInfo.append('json', JSON.stringify({
+                roleForm: this.roleForm,
+                rh_pageData: this.rh_pageData,
+                commentText: this.commentText
+              }))
+              processBack(paramsInfo).then(res => {
                 this.taskID = res.data
                 const params = new FormData();
                 params.set('json', JSON.stringify(json))
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
index ef76e0fb6..96510f1c9 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
@@ -338,7 +338,7 @@ import ProcessTitle from '../../components/ProcessTitle'
 import {
   startProcess, queryTaskFirst,
   saveTaskFirst, completeTask,
-  taskDel, workGroup} from '@/api/process.js'
+  taskDel, workGroup, processBack} from '@/api/process.js'
 
 export default {
   components: {
@@ -658,10 +658,18 @@ export default {
           this.$refs['roleForm'].validate((valid) => {
             if (valid) {
               this.isSubmit = true
-              const paramsInfo = {
-                type: '21'
-              }
-              startProcess(paramsInfo).then(res => {
+              let paramsInfo = new FormData()
+              paramsInfo.append('id', this.bpnId || '')
+              paramsInfo.append('createUser', this.$store.getters.userInfo.userId)
+              paramsInfo.append('createUserName', this.$store.getters.userInfo.userName)
+              paramsInfo.append('type', '21')
+              paramsInfo.append('json', JSON.stringify({
+                roleForm: this.roleForm,
+                ch_pageData: this.ch_pageData,
+                commentText: this.commentText
+
+              }))
+              processBack(paramsInfo).then(res => {
                 this.taskID = res.data
                 const params = new FormData();
                 params.set('json', JSON.stringify(json))
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
index 6533ae6c2..e312fcbca 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
@@ -266,7 +266,7 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import { startProcess, completeTask, saveTaskFirst, queryTaskFirst, taskDel } from '@/api/process.js'
+import { startProcess, completeTask, saveTaskFirst, queryTaskFirst, taskDel,processBack } from '@/api/process.js'
 import { standUnqualified, dicTypeData } from '@/api/unqualProcess.js'
 export default {
   name: "wfhxzgStep1",
@@ -509,10 +509,17 @@ export default {
           this.$refs['roleForm'].validate((valid) => {
             if (valid) {
               this.isSubmit = true
-              const paramsInfo = {
-                type: '8'
-              }
-              startProcess(paramsInfo).then(res => {
+              let paramsInfo = new FormData()
+              paramsInfo.append('id', this.bpnId || '')
+              paramsInfo.append('createUser', this.$store.getters.userInfo.userId)
+              paramsInfo.append('createUserName', this.$store.getters.userInfo.userName)
+              paramsInfo.append('type', '8')
+              paramsInfo.append('json', JSON.stringify({
+                roleForm: this.roleForm,
+                dataList: this.dataList,
+                commentText: this.commentText
+              }))
+              processBack(paramsInfo).then(res => {
                 this.taskID = res.data
                 const params = new FormData();
                 params.set('json', JSON.stringify(json))

From c1da95333313a5dfcabfd2668855e7d0937caeda Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Thu, 16 Dec 2021 15:09:55 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=92=A4=E9=94=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzqdfb/step1.vue             | 13 ++++++++++++-
 .../pages/creatProcess/cywbbzzxd/step1.vue          | 11 ++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index d3a13061a..cf9ecbb40 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -1062,7 +1062,18 @@ export default {
             this.$refs["Form"].validate((valid) => {
               if (valid) {
                 this.isSubmit = true
-                this.$http.get("lawss/activiti/startProcess", {type: "4"}, {
+                this.$http.post("lawss/activiti/startProcessRollBack", {
+                  id: this.bpnId || '',
+                  createUser: this.$store.getters.userInfo.userId,
+                  createUserName: this.$store.getters.userInfo.userName,
+                  type: '4',
+                  json: JSON.stringify({
+                    taskInfo: '引入法规标准清单',
+                    form: this.listForm,
+                    roleForm: this.roleForm,
+                    commentText: this.commentText
+                  })
+                }, {
                   _this: this
                 }, res => {
                   if (res.ok) {
diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue
index f46d88d82..c1af624bd 100644
--- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue
@@ -186,7 +186,16 @@ export default {
       this.$refs["Form"].validate((valid) => {
         if (valid) {
           this.isSubmit = true
-          this.$http.get("lawss/activiti/startProcess", {type: "14"}, {
+          this.$http.post("lawss/activiti/startProcessRollBack", {
+            id: this.bpnId || '',
+            createUser: this.$store.getters.userInfo.userId,
+            createUserName: this.$store.getters.userInfo.userName,
+            type: '14',
+            json: JSON.stringify({
+              taskInfo: '责任部门对接人选择责任人',
+              roleForm: this.roleForm,
+            })
+          }, {
             _this: this
           }, res => {
             if (res.ok) {

From 8ae24764fc5cda2c838ae9ae1ec4c58c7b3e02c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 16 Dec 2021 15:18:02 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B9=98=E7=94=A8?=
 =?UTF-8?q?=E8=BD=A6vpps=E7=BC=96=E7=A0=81=20=E6=A8=A1=E5=9D=97=E5=8F=98?=
 =?UTF-8?q?=E5=9E=8B=E5=8F=B7=20=20=E4=BC=81=E6=A0=87=E7=B1=BB=E5=88=AB?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/EnterpriseStandardDatabase.vue | 203 ++++++++++++++----
 1 file changed, 166 insertions(+), 37 deletions(-)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 59b78eea8..4a3ab6e41 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -610,16 +610,63 @@
                             <el-input v-model="sarBussionessStandEO.TXLBBUSS" placeholder="选择体系类别" @click.native="choiceZRR1('TXLBBUSS', '体系类别', sarBussionessStandEO.TXLBBUSS)"></el-input>
                         </el-form-item>
                     </template>
-                    <template v-else-if="field.attrField === 'VPPSBMBUSS'">
+                    <template v-else-if="field.attrField === 'CYCVPPSBMBUSS'">
                         <el-form-item
-                                prop="VPPSBMBUSS"
+                                prop="CYCVPPSBMBUSS"
                                 label-width="150px"
                                 class="add-form-item"
                         >
-                            <template slot="label">关联模块--VPPS编码</template>
-                            <el-input v-model="sarBussionessStandEO.VPPSBMBUSS" placeholder="选择VPPS编码" @click.native="choiceZRR2('VPPSBMBUSS', 'VPPS编码', sarBussionessStandEO.VPPSBMBUSS,true)"></el-input>
+                            <template slot="label">关联模块--乘用车VPPS编码</template>
+                            <el-input v-model="sarBussionessStandEO.CYCVPPSBMBUSS" placeholder="选择VPPS编码" @click.native="choiceZRR2('car', '乘用车VPPS编码', sarBussionessStandEO.KCVPPSBMBUSS,true)"></el-input>
                         </el-form-item>
                     </template>
+                  <template v-else-if="field.attrField === 'CYCVPPSCNBUSS'">
+                    <el-form-item title="关联模块--乘用车vpps中文名称" label="关联模块--乘用车vpps中文名称" label-width="150px"
+                                  prop="CYCVPPSCNBUSS" class="add-form-item">
+                      <el-input
+                        v-model="sarBussionessStandEO.CYCVPPSCNBUSS" disabled
+                        clearable
+                      ></el-input>
+                    </el-form-item>
+                  </template>
+                    <template v-else-if="field.attrField === 'KCVPPSBMBUSS'">
+                      <el-form-item
+                        prop="KCVPPSBMBUSS"
+                        label-width="150px"
+                        class="add-form-item"
+                      >
+                        <template slot="label">关联模块--卡车VPPS编码</template>
+                        <el-input v-model="sarBussionessStandEO.KCVPPSBMBUSS" placeholder="选择VPPS编码" @click.native="choiceZRR3('struck', '卡车VPPS编码', sarBussionessStandEO.KCVPPSBMBUSS,true)"></el-input>
+                      </el-form-item>
+                    </template>
+                    <template v-else-if="field.attrField === 'KCVPPSCNBUSS'">
+                      <el-form-item title="关联模块--乘用车vpps中文名称" label="关联模块--乘用车vpps中文名称" label-width="150px"
+                                    prop="KCVPPSCNBUSS" class="add-form-item">
+                        <el-input
+                          v-model="sarBussionessStandEO.KCVPPSCNBUSS" disabled
+                          clearable
+                        ></el-input>
+                      </el-form-item>
+                  </template>
+                  <template v-else-if="field.attrField === 'DYBXHBUSS'">
+                    <el-form-item
+                      prop="DYBXHBUSS"
+                      label-width="150px"
+                      class="add-form-item"
+                    >
+                      <template slot="label">模块结构单元变型号</template>
+                      <el-input v-model="sarBussionessStandEO.DYBXHBUSS" placeholder="选择模块结构单元变型号"
+                                @click.native="choiceZRR4('dybxhbuss', '模块结构单元', sarBussionessStandEO.dybxh)"></el-input>
+                    </el-form-item>
+                  </template>
+                  <template v-else-if="field.attrField === 'DYMCBUSS'">
+                    <el-form-item label="模块结构单元名称" label-width="150px" prop="DYMCBUSS" class="add-form-item">
+                      <el-input
+                        v-model="sarBussionessStandEO.DYMCBUSS" disabled
+                        clearable
+                      ></el-input>
+                    </el-form-item>
+                  </template>
                     <template v-else-if="field.attrField === 'VPPSCNBUSS'">
                         <el-form-item title="关联模块--中文名称" label="关联模块--中文名称" label-width="150px" prop="VPPSCNBUSS" class="add-form-item">
                             <el-input
@@ -1298,11 +1345,38 @@
               :multiple="multipleFlag2"
               :check-strictly=true
               :modalShowFlag="modalShowFlag2"
-              :drawerTitle="drawerTitle"
+              :drawerTitle="drawerTitle2"
+              :type="type"
               :url="url"
               :urlChild="urlChild"
               :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
-              :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
+              :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"
+              @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
+    <tree-select-new
+      width="500"
+      :lazy=true
+      :multiple=true
+      :check-strictly=true
+      :modalShowFlag="modalShowFlag3"
+      :drawerTitle="drawerTitle3"
+      :url="url"
+      :type="'truck'"
+      :urlChild="urlChild"
+      :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
+      :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"
+      @popoverHideCancel="popoverHideCarVsCancel()"></tree-select-new>
+    <tree-select-module
+      width="500"
+      :lazy=true
+      :multiple=true
+      :check-strictly=true
+      :modalShowFlag="modalShowFlag4"
+      :drawerTitle="drawerTitle4"
+      :url="url"
+      :urlChild="urlChild"
+      :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
+      :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"
+      @popoverHideCancel="popoverHideModelCancel()"></tree-select-module>
   </div>
 </template>
 
@@ -1320,6 +1394,7 @@ import CustomSVPPS from '@/components/CustomFormComponents/SVPPS'
 import TreeSelect from '@/components/treeSelect/treeSelect.vue';
 import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
 import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle'
+import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
 
 import {mapGetters} from 'vuex'
 import store from "@/store";
@@ -1338,6 +1413,7 @@ export default {
     CustomSVPPS,
     TreeSelect,
     TreeSelectNew,
+    treeSelectModule,
     ProcessTitle
   },
   props: {
@@ -1496,6 +1572,12 @@ export default {
       sarBussionessStandEO: {
         TXLBBUSS:'',
         VPPSBMBUSS:'',
+        KCVPPSBMBUSS: '',
+        KCVPPSCNBUSS: '',
+        DYBXHBUSS: '',
+        DYMCBUSS: '',
+        CYCVPPSBMBUSS: '',
+        CYCVPPSCNBUSS: '',
         VPPSCNBUSS:'',
         regionShow: '亚洲',
         region: '2T8PFTSYE7',
@@ -1880,6 +1962,12 @@ export default {
           SYCPXCLASS:'',
           TXLBBUSS:'',
           VPPSBMBUSS:'',
+        KCVPPSBMBUSS: '',
+        KCVPPSCNBUSS: '',
+        CYCVPPSBMBUSS: '',
+        CYCVPPSCNBUSS: '',
+        DYBXHBUSS: '',
+        DYMCBUSS: '',
           VPPSCNBUSS:'',
         // 关联信息
           DTQBBHBUSS:'',
@@ -1965,6 +2053,9 @@ export default {
         syrzOptions:[],//适用认证下拉框
         gkglbmOptions:[],//归口管理部门下拉框
       drawerTitle: '',
+      drawerTitle3: '',
+      drawerTitle4: '',
+      drawerTitle2: '',
       modalShowRoleFlag: false,
       nodeList: [],
       nodeList2: [],
@@ -2023,6 +2114,7 @@ export default {
       modalShowFlag2: false, // drawer开关
       modalShowFlag3: false, // drawer开关
       modalShowFlag4: false, // drawer开关
+      type: '',
       url:'',
       urlChild:'',
     }
@@ -2085,27 +2177,56 @@ export default {
           return [year, month, day].join('-') + " " + [hour, minute, second].join(':');//格式为：YY-MM-DD hh:mm:ss（当前时间）
       },
       popoverHideQuery(ids,attrField){
-          console.log(ids)
-          console.log("-----------------------------")
-          console.log(attrField)
       },
+    popoverHideBusVsCancel() {
+      this.modalShowFlag2 = false
+    },
       popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-          if(checkedData) {
-              if(checkedData.length > 0){
-                  this.sarBussionessStandEO.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
-                  this.sarBussionessStandEO.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
-                  this.sarBussionessSearch.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
-                  this.sarBussionessSearch.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
-              }else {
-                  this.sarBussionessStandEO.VPPSBMBUSS = checkedData.code
-                  this.sarBussionessStandEO.VPPSCNBUSS = checkedData.chineseName
-                  this.sarBussionessSearch.VPPSBMBUSS = checkedData.code
-                  this.sarBussionessSearch.VPPSCNBUSS = checkedData.chineseName
-              }
+        if (checkedData && checkedData.length != 0) {
+          if (checkedData.length > 0) {
+            this.sarBussionessStandEO.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
+            this.sarBussionessStandEO.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
+          } else {
+            this.sarBussionessStandEO.CYCVPPSBMBUSS = checkedData.code
+            this.sarBussionessStandEO.CYCVPPSCNBUSS = checkedData.chineseName
           }
           this.modalShowFlag2 = false
+        }
           this.$forceUpdate()
       },
+    popoverHideCarVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
+      if (checkedData && checkedData.length != 0) {
+        if (checkedData.length > 0) {
+          this.sarBussionessStandEO.KCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
+          this.sarBussionessStandEO.KCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
+        } else {
+          this.sarBussionessStandEO.KCVPPSBMBUSS = checkedData.code
+          this.sarBussionessStandEO.KCVPPSCNBUSS = checkedData.chineseName
+        }
+        this.modalShowFlag3 = false
+      }
+
+      this.$forceUpdate()
+    },
+    popoverHideCarVsCancel() {
+      this.modalShowFlag3 = false
+    },
+    popoverHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
+      if (checkedData && checkedData.length != 0) {
+        if (checkedData.length > 0) {
+          this.sarBussionessStandEO.DYBXHBUSS = checkedData.map(item => item.model).join(",")
+          this.sarBussionessStandEO.DYMCBUSS = checkedData.map(item => item.name).join(",")
+        } else {
+          this.sarBussionessStandEO.DYBXHBUSS = checkedData.model
+          this.sarBussionessStandEO.DYMCBUSS = checkedData.name
+        }
+        this.modalShowFlag4 = false
+      }
+      this.$forceUpdate()
+    },
+    popoverHideModelCancel() {
+      this.modalShowFlag4 = false
+    },
       popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
           if(checkedData) {
               if(checkedData.length > 0){
@@ -2120,14 +2241,31 @@ export default {
           this.$forceUpdate()
       },
       choiceZRR2 (type, title, id,multFlag) {
-          this.drawerTitle = title
+          this.drawerTitle2 = title
           this.modalShowFlag2 = true
           this.multipleFlag2 = multFlag
           this.url = ''
           this.urlChild = ''
+          this.type = type
           this.url="sarVppsTree/list"
           this.urlChild="sarVppsTree/childByList"
       },
+    choiceZRR3(type, title, id) {
+      this.drawerTitle3 = title
+      this.modalShowFlag3 = true
+      this.url = ''
+      this.urlChild = ''
+      this.url = "sarVppsTree/list"
+      this.urlChild = "sarVppsTree/childByList"
+    },
+    choiceZRR4(type, title, id) {
+      this.drawerTitle4 = title
+      this.modalShowFlag4 = true
+      this.url = ''
+      this.urlChild = ''
+      this.url = "sarModelTree/list"
+      this.urlChild = "sarModelTree/childByList"
+    },
       choiceZRR1 (type, title, id) {
           this.drawerTitle1 = title
           this.modalShowFlag1 = true
@@ -2883,7 +3021,6 @@ export default {
                         })
                     })
                     this.dynamicFormField = displayLocation
-                  console.log('2805',this.dynamicFormField)
                     this.loading = false
                 })
                 this.sarBussionessStandEO = JSON.parse(JSON.stringify(item))
@@ -2935,7 +3072,6 @@ export default {
       $('#deptBtn2').click()
     },
     choiceQCR (type, title, id) {
-      console.log('2077',title)
       this.nodeList = []
       this.nodeList.push(id)
       this.userType = type
@@ -2943,7 +3079,6 @@ export default {
       this.modalShowRoleFlag = true
     },
     checkedRole2 (data) {
-      console.log('1712',this.drawerTitle)
       let idList = ''
       let nameList = ''
       data.forEach( item => {
@@ -2966,8 +3101,6 @@ export default {
       this.modalshowflagZRBM = true
     },
     drawerCheckZRBM(data) {
-
-      console.log("5389", data);
       let idList = ''
       let nameList = ''
       data.forEach(item => {
@@ -3001,7 +3134,6 @@ export default {
             if (flag) {
               // 时间格式修改
               let nowstandinfo = JSON.parse(JSON.stringify(this.sarBussionessStandEO))
-              console.log(nowstandinfo)
               if (nowstandinfo.issueTime != null && nowstandinfo.issueTime !== '') {
                 nowstandinfo.issueTime = this.$dateFormat(this.sarBussionessStandEO.issueTime, 'yyyy-MM-dd hh:mm:ss')
               }
@@ -3018,7 +3150,6 @@ export default {
               }
               // 处理动态表单的时间和下拉框格式
               const formFieldList = this.formFieldList
-              console.log(this.formFieldList)
               const sarStandAttrObj = {}
               formFieldList.forEach((item) => {
                 const value = nowstandinfo[item.attrField]
@@ -3713,8 +3844,6 @@ export default {
         }
         this.standinfoList = []
         this.standinfoList = res.data.list
-          console.log(this.standinfoList)
-          console.log(res.data.list)
         this.total = res.data.count
         if ((this.standinfoList.length === 0 || this.standinfoList === []) && this.sarBussionessSearch.page !== 1) {
           this.pageChange(1)
@@ -3826,7 +3955,6 @@ export default {
           }
         })
       } else if (this.ocrList.length === 1 && type === '2'){
-        console.log('4228',this.ocrList)
         this.selectStandardPro(this.ocrList[0], 'edit')
       }
     },
@@ -3983,7 +4111,6 @@ export default {
         }, {
           _this: this
         }, res => {
-          console.log('getAreaList',res.data)
           this.showRegionOptions = res.data || []
           resolve(res.data || [])
         }, e => {
@@ -4073,7 +4200,10 @@ export default {
             rule.push({ required: true, message: `${item.attrName}不能为空`, trigger: 'change' })
           }
         }
-        if (item.attrLen && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS') {
+        if (item.attrLen && item.attrType === 'INPUT_STR' && item.attrField === 'DTQBBHBUSS') {
+          rule.push({type: 'string', max: 500, message: '代替企标编号不能超过500个字符', trigger: 'change'})
+        }
+        if (item.attrLen && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS'&& item.attrType !== 'INPUT_STR') {
           rule.push({type: 'string', max: item.attrLen, message: `${item.attrName}不能超过${item.attrLen}个字符`, trigger: 'change'})
         }
         if (rule.length > 0) {
@@ -4084,6 +4214,7 @@ export default {
       // this.rules = rules
       this.$set(this, 'sarBussionessStandRules', rules)
 
+
       setTimeout(() => {
         this.reloadAddForm = true
       }, 1000)
@@ -4140,7 +4271,6 @@ export default {
         }
           this.stahndinfoList = []
           this.stahndinfoList = res.data.list
-          console.log(this.stahndinfoList)
         this.total = res.data.count
         if ((this.stahndinfoList.length === 0 || this.stahndinfoList === []) && this.sarBussionessSearch.page !== 1) {
           this.pageChange(1)
@@ -4292,7 +4422,6 @@ export default {
                   day = "0" + day;
                 }
                 const FSRQBUSS = year + "-" + month + "-" + day;
-                console.log(FSRQBUSS,"FSRQBUSS");
                 this.sarBussionessStandEO["FSRQBUSS"] = FSRQBUSS
 
               }
@@ -4332,7 +4461,7 @@ export default {
       this.energyKindOptions = res.data.ENERGYTYPES
       this.standGeneraOptions = res.data.BUSSBIGCLASS
       this.standSubclassOptions = res.data.BUSSFINECLASS
-        this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
+        this.standSortOptions = res.data.BUSSSTANDCLASS // 企业标准类别
         this.standNatureOptions = res.data.SARPROPERTY // 标准性质
         this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态
         this.standSystemOptions = res.data.TXLBBUSS // 标准体系

From 95a4cd5680ccca1791c4ba0ab95c603fa5592e77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 16 Dec 2021 16:05:46 +0800
Subject: [PATCH 4/5] commit

---
 src/pages/processCenter/pages/newProcess/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue
index 5892599d3..f62646464 100644
--- a/src/pages/processCenter/pages/newProcess/index.vue
+++ b/src/pages/processCenter/pages/newProcess/index.vue
@@ -347,13 +347,13 @@
         </div>
         <div class="process-name">
           <el-card shadow="hover">
-            <div class="card-box" @click="handleCreateProcess('15')">
+            <div class="card-box" @click="handleCreateProcess('14')">
               <div class="card-top">
                 <div class="card-top-left">
                   <img :src="getImg(Math.floor(Math.random() * 6))">
                 </div>
                 <div class="card-top-right">
-                  <div class="card-top-right-text">加入标准化协会信息提报流程</div>
+                  <div class="card-top-right-text">参与外部标准制修订信息提报流程</div>
                   <div class="card-top-right-line"></div>
                 </div>
               </div>

From 5555a7a04c7a4ffb80eb5a76df73bbdeb01284e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 16 Dec 2021 16:41:58 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E8=B5=B7=E8=8D=89=E4=BA=BA=20=E8=B5=B7?=
 =?UTF-8?q?=E8=8D=89=E9=83=A8=E9=97=A8=E5=BF=85=E5=A1=AB=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/EnterpriseStandardDatabase.vue  | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 4a3ab6e41..5801004e3 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -3089,7 +3089,12 @@ export default {
         idList += item.id
         nameList += item.name
       })
-      this.sarBussionessStandEO['QCRBUSS'] = nameList
+      this.$set(this.sarBussionessStandEO, 'QCRBUSS', nameList)
+      if(this.sarBussionessStandEO.QCRBUSS){
+        this.$refs.sarBussionessStandForm.validateField('QCRBUSS')
+      }
+      // this.sarBussionessStandEO['QCRBUSS'] = nameList
+
 
     },
     choiceQCDW(type, title, id) {
@@ -3113,9 +3118,13 @@ export default {
         nameList += item.name
         // }
       })
-
-      this.sarBussionessStandEO.QCDWId = idList;
-      this.sarBussionessStandEO['QCDW'] = nameList;
+      this.$set(this.sarBussionessStandEO, 'QCDWId', idList)
+      this.$set(this.sarBussionessStandEO, 'QCDW', nameList)
+      if(this.sarBussionessStandEO.QCRBUSS){
+        this.$refs.sarBussionessStandForm.validateField('QCDW')
+      }
+      // this.sarBussionessStandEO.QCDWId = idList;
+      // this.sarBussionessStandEO['QCDW'] = nameList;
 
     },
     // 新增-表单空
@@ -4189,6 +4198,7 @@ export default {
       this.reloadAddForm = false
       const formFieldList = this.formFieldList
       const rules = {...this.defaultAddFormFieldRules}
+      console.log(formFieldList);
       formFieldList.forEach((item) => {
         const rule = []
         if (item.isMust === '0') {