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

src/components/treeSelect/treeSelectModule.vue

@@ -207,7 +207,9 @@
                 })
             },
             loadTreeData(resolve) {
-            // 获取loadtreeData 就是父节点数据，getChildByList就是异步获取子节点数据
+                console.log(this.url);
+                console.log(this.type);
+                // 获取loadtreeData 就是父节点数据，getChildByList就是异步获取子节点数据
                 this.$http.get(this.url,  {type : this.type}, {
                     _this: this
                 }, res => {

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

@@ -333,16 +333,16 @@
                 },
                 roleFormRules: {
                     dockUserName: [
-                        { required: true, message: '请选择责任部门对接人', trigger: 'change' },
+                        { required: true, message: '请技术委员会相关专委会主任/ 工程研究总院责任部门领导、事业部标准化员', trigger: 'change' },
                     ],
                     ministerUserName: [
-                        { required: true, message: '请选择标准法规部部长', trigger: 'change' },
+                        { required: true, message: '请选择标准法规部高级经理、责任部门高级经理', trigger: 'change' },
                     ],
                     directorUserName: [
-                        { required: true, message: '请选择技术管理中心主任', trigger: 'change' },
+                        { required: true, message: '请选择技术委员会相关专委会主任/ 工程研究总院责任部门中心主任、技术管理中心主任', trigger: 'change' },
                     ],
                     presidentUserName: [
-                        { required: true, message: '请选择工程研究院院长', trigger: 'change' },
+                        { required: true, message: '请选择工程研究总院院长/标准法规业务主管副院长', trigger: 'change' },
                     ]
                 },
                 fileUrl: 'api/att/attFile/upload',

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

@@ -337,16 +337,16 @@ export default {
       },
       roleFormRules: {
         dockUserName: [
-          { required: true, message: '请选择责任部门对接人', trigger: 'change' },
+          { required: true, message: '请技术委员会相关专委会主任/ 工程研究总院责任部门领导、事业部标准化员', trigger: 'change' },
         ],
         ministerUserName: [
-          { required: true, message: '请选择标准法规部部长', trigger: 'change' },
+          { required: true, message: '请选择标准法规部高级经理、责任部门高级经理', trigger: 'change' },
         ],
         directorUserName: [
-          { required: true, message: '请选择技术管理中心主任', trigger: 'change' },
+          { required: true, message: '请选择技术委员会相关专委会主任/ 工程研究总院责任部门中心主任、技术管理中心主任', trigger: 'change' },
         ],
         presidentUserName: [
-          { required: true, message: '请选择工程研究院院长', trigger: 'change' },
+          { required: true, message: '请选择工程研究总院院长/标准法规业务主管副院长', trigger: 'change' },
         ]
       },
       fileUrl: 'api/att/attFile/upload',

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

@@ -607,7 +607,7 @@
                         { required: true, message: '请选择责任部门对接人', trigger: 'change' },
                     ],
                     deptUserId: [
-                        { required: true, message: '请选择标准法规部部长', trigger: 'change' },
+                        { required: true, message: '请选择标准法规部高级经理', trigger: 'change' },
                     ],
                 },
                 treeData: [],

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

@@ -619,7 +619,7 @@ export default {
           {required: true, message: '请选择责任部门对接人', trigger: 'change'},
         ],
         deptUserId: [
-          {required: true, message: '请选择标准法规部部长', trigger: 'change'},
+          {required: true, message: '请选择标准法规部高级经理', trigger: 'change'},
         ],
       },
       treeData: [],

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

@@ -265,7 +265,7 @@
                 </el-form-item>
                 <el-form-item label="标准号/标准名称" class="search-item search-item-last">
                   <el-input
-                    v-model="standardSearch.standName"
+                    v-model="standardSearch.standNumber"
                     placeholder="请输入标准号或标准名称"
                   ></el-input>
                 </el-form-item>
@@ -533,7 +533,7 @@ export default {
       },
       standardSearch: {
         standType: "",
-        standName: ""
+        standNumber: ""
       },
       decomposeOptions: [], //分解单数据
       standardTypeOptions: [

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

@@ -612,7 +612,7 @@
                     :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
                     :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs" @popoverHideCancel="popoverHideCarVsCancel"></tree-select-new>
                 </el-form-item>
-                <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
+                <el-form-item label="模块结构单元变型号(卡车)" prop="dybxh" class="add-form-item form-item-disabled">
                   <el-input v-model="form.dybxh" placeholder="选择模块结构单元变型号" clearable @click.native="choiceZRR4('dybxh', '模块结构单元', form.dybxh)"></el-input>
                   <tree-select-module
                     width="800"
@@ -623,6 +623,7 @@
                     :modalShowFlag="modalShowFlag4"
                     :drawerTitle="drawerTitle"
                     :url="url"
+                    :type="'TRUCK'"
                     :show-checkBox="showCheckBox"
                     :urlChild="urlChild"
                     :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
@@ -2454,7 +2455,7 @@ export default {
       this.modalShowFlag4 = true
       this.url = ''
       this.urlChild = ''
-      this.url = "sarModelTree/list"
+      this.url = "sarModelTree/listByType"
       this.urlChild = "sarModelTree/childByList"
       this.key3++
     },

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

@@ -456,16 +456,16 @@ export default {
       },
       roleFormRules: {
         dockUserList: [
-          {required: true, message: '请选择责任部门对接人', trigger: 'change'},
+          {required: true, message: '请选择标准法规工程师、事业部标准化员', trigger: 'change'},
         ],
         ministerUser: [
-          {required: true, message: '请选择标准法规部部长', trigger: 'change'},
+          {required: true, message: '请选择标准法规部高级经理、责任部门高级经理', trigger: 'change'},
         ],
         directorUser: [
-          {required: true, message: '请选择技术管理中心主任', trigger: 'change'},
+          {required: true, message: '请选择技术委员会相关专委会主任/ 工程研究总院责任部门中心主任、技术管理中心主任', trigger: 'change'},
         ],
         presidentUser: [
-          {required: true, message: '请选择工程研究院院长', trigger: 'change'},
+          {required: true, message: '请选择工程研究院总院院长/标准法规业务主管副院长', trigger: 'change'},
         ]
       },
       nodeList: [],

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

@@ -467,16 +467,16 @@ export default {
       },
       roleFormRules: {
         dockUserList: [
-          {required: true, message: '请选择责任部门对接人', trigger: 'change'},
+          {required: true, message: '请选择标准法规工程师、事业部标准化员', trigger: 'change'},
         ],
         ministerUser: [
-          {required: true, message: '请选择标准法规部部长', trigger: 'change'},
+          {required: true, message: '请选择标准法规部高级经理、责任部门高级经理', trigger: 'change'},
         ],
         directorUser: [
-          {required: true, message: '请选择技术管理中心主任', trigger: 'change'},
+          {required: true, message: '请选择技术委员会相关专委会主任/ 工程研究总院责任部门中心主任、技术管理中心主任', trigger: 'change'},
         ],
         presidentUser: [
-          {required: true, message: '请选择工程研究院院长', trigger: 'change'},
+          {required: true, message: '请选择工程研究院总院院长/标准法规业务主管副院长', trigger: 'change'},
         ]
       },
       nodeList: [],