Merge branch 'develop' into FOTON

src/components/CustomFormComponents/DatePicker.vue

@@ -14,7 +14,7 @@
         :value-format="valueFormat"
         format="yyyy-MM-dd"
         :value="value"
-        type="dates"
+        type="date"
         :editable="true"
         :disabled="disabled"
         :placeholder="placeholder"
@@ -74,7 +74,4 @@ export default {
 </script>
 
 <style scoped>
-/deep/ .el-input__inner {
-  padding-left: 30px;
-}
 </style>

src/components/CustomFormComponents/DatePickerGroup.vue

@@ -145,6 +145,9 @@ export default {
   watch: {
     value (val) {
       this.tagList = val !== '' && val !== null ? val.split(',') : []
+      this.tagList=this.tagList.map((item)=>item.substring(0,10))
+      console.log("this.tagList",this.tagList);
+
     },
     tagList: {
       handler (val) {

src/components/mechanismTree/index.vue

@@ -23,6 +23,7 @@
           class="filter-tree tree-line"
           :data="treeData"
           :props="defaultProps"
+          :check-strictly="true"
           :current-node-key="nodeKeyId"
           node-key="id"
           :filter-node-method="filterNode"

src/components/treeSelect/treeSelectModule.vue

@@ -0,0 +1,332 @@
+<template>
+    <el-drawer
+            class="org-tree"
+            :title="drawerTitle"
+            :visible.sync="modalShowFlag"
+            :size="width"
+            :append-to-body=true
+            :before-close="cancelUserInfo"
+            :show-checkbox="showCheckBox"
+            >
+        <el-tree class="common-tree" :style="style" ref="tree" :data="data" :props="defaultProps"
+                 :load="loadNode"
+                 :lazy="lazy"
+                 :show-checkbox="multiple"
+                 :node-key="nodeKey"
+                 :check-strictly="checkStrictly"
+                 :expand-on-click-node="false"
+                 :default-checked-keys="defaultCheckedKeys"
+                 :highlight-current="true"
+                 @node-click="handleNodeClick"
+                 @check-change="handleCheckChange">
+        </el-tree>
+        <div id="roleFormButton" class="demo-drawer-footer">
+            <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
+            <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelUserInfo">取消</el-button>
+        </div>
+    </el-drawer>
+</template>
+
+<script>
+// 模块单元结构只能叶子节点多选, 关联模块vpps不用限制只能叶子节点,所以另起一个组件实现只能叶子节点多选功能  …(⊙_⊙;)…(技术有限)
+     export default {
+        name: "treeSelectModule",
+        props: {
+            // 树结构数据
+            data: {
+                type: Array,
+                default () {
+                    return [];
+                }
+            },
+            url: {
+                type: String,
+                default () {
+                    return "";
+                }
+            },
+          type: {
+            type: String,
+            default () {
+              return "";
+            }
+          },
+            urlChild: {
+                type: String,
+                default () {
+                    return "";
+                }
+            },
+            params: {
+                type: Object,
+                default () {
+                    return {};
+                }
+            },
+            defaultProps: {
+                type: Object,
+                default () {
+                    return {};
+                }
+            },
+            // 配置是否可多选
+            multiple: {
+                type: Boolean,
+                default () {
+                    return false;
+                }
+            },
+            lazy: {
+                type: Boolean,
+                default () {
+                    return false;
+                }
+            },
+            nodeKey: {
+                type: String,
+                default () {
+                    return 'id';
+                }
+            },
+            // 显示复选框情况下，是否严格遵循父子不互相关联
+            checkStrictly: {
+                type: Boolean,
+                default () {
+                    return false;
+                }
+            },
+            disabled: {
+                type: Boolean,
+                default () {
+                    return false;
+                }
+            },
+            // 默认选中的节点key数组
+            checkedKeys: {
+                type: Array,
+                default () {
+                    return [];
+                }
+            },
+            width: {
+                type: String,
+                default () {
+                    return "";
+                }
+            },
+            drawerTitle:{
+                type: String,
+                default () {
+                    return '';
+                }
+            },
+          showCheckBox:{
+                type: Boolean,
+                default () {
+                    return true;
+                }
+            },
+            // 配置是否展开
+            modalShowFlag: {
+                type: Boolean,
+                default () {
+                    return false;
+                }
+            },
+        },
+        data () {
+            return {
+                nodeList: [],
+                defaultCheckedKeys: [],
+                isShowSelect: false, // 是否显示树状选择器
+                options: [],
+                selectedData: [], // 选中的节点
+                style: 'width:' + this.width + 'px;' + '',
+                selectStyle: 'width:100%;',
+                checkedIds: [],
+                checkedData: [],
+            };
+        },
+        created(){
+        },
+        mounted () {
+            if (this.checkedKeys.length > 0) {
+                if (this.multiple) {
+                    this.defaultCheckedKeys = this.checkedKeys;
+                    this.getChildByIDSList(this.defaultCheckedKeys);
+                    // this.selectedData = this.checkedKeys.map((item) => {
+                    //     var node = this.$refs.tree.getNode(item);
+                    //     return node.label;
+                    // });
+                } else {
+                    const item = this.checkedKeys[0];
+                    this.getChildByIDSList(item);
+                    // this.$refs.tree.setCurrentKey(item);
+                    // var node = this.$refs.tree.getNode(item);
+                    // this.selectedData = node.label;
+                }
+            }
+        },
+        methods: {
+            loadNode(node, resolve) {
+                const that = this;
+
+                if (node.level === 0) {
+                    that.loadTreeData(resolve);
+                }
+
+                if (node.level >= 1) {
+                    setTimeout(() => {
+                        this.getChildByList(node.data.level,node.data.id, resolve);
+                    }, 500);
+                    return resolve([]); // 加上这个，防止在该节点没有子节点时一直转圈的问题发生。
+                }
+
+
+            },
+            getChildByIDSList( _parentID) {     // 获取子节点请求
+                let params = {ids : _parentID};
+                this.$http.get(this.urlChild, params, {
+                    _this: this
+                }, res => {
+                    if(res.data){
+                        this.$emit('popoverHide', this.checkedIds, res.data,false);
+                    }
+                })
+            },
+            getChildByList( level,id,resolve) {     // 获取子节点请求
+                let params = {level : level,id :id,type : this.type};
+                this.$http.get(this.urlChild, params, {
+                    _this: this
+                }, res => {
+                    if(res.data){
+                        resolve(res.data);
+                    }else {
+                        return false;
+                    }
+                })
+            },
+            loadTreeData(resolve) {
+            // 获取loadtreeData 就是父节点数据，getChildByList就是异步获取子节点数据
+                this.$http.get(this.url,  {type : this.type}, {
+                    _this: this
+                }, res => {
+                    if(res.data){
+                        resolve(res.data)
+                    }else {
+                        return false;
+                    }
+                })
+            },
+            popoverHide () {
+
+            },
+            // 节点被点击时的回调,返回被点击的节点数据
+            handleNodeClick (data, node) {
+                if (!this.multiple) {
+                    let tmpMap = {};
+                    tmpMap.value = node.key;
+                    tmpMap.label = node.label;
+                    this.options = [];
+                    this.options.push(tmpMap);
+                    this.selectedData = node.label;
+                    this.isShowSelect = !this.isShowSelect;
+                }
+            },
+          // 递归
+          getTreeData(data) {
+            // 循环遍历json数据
+            for (let i = 0; i < data.length; i++) {
+              if (data[i].children.length < 1) {
+                // children若为空数组，则将children设为undefined
+                delete data[i].children
+              } else {
+                // children若不为空数组，则继续 递归调用 本方法
+                this.getTreeData(data[i].children)
+              }
+            }
+            return data
+          },
+            // 节点选中状态发生变化时的回调
+            handleCheckChange () {
+                var checkedKeys = this.$refs.tree.getCheckedKeys(); // 所有被选中的节点的 key 所组成的数组数据
+                this.options = checkedKeys.map((item) => {
+                    var node = this.$refs.tree.getNode(item); // 所有被选中的节点对应的node
+                    let tmpMap = {};
+                    tmpMap.value = node.key;
+                    tmpMap.label = node.label;
+                    return tmpMap;
+                });
+                this.selectedData = this.options.map((item) => {
+                    return item.label;
+                });
+            },
+            saveUserInfo () {
+                if (this.multiple) {
+                    this.checkedIds = this.$refs.tree.getCheckedKeys(); // 所有被选中的节点的 key 所组成的数组数据
+                    this.checkedData = this.$refs.tree.getCheckedNodes(); // 所有被选中的节点所组成的数组数据
+                } else {
+                    this.checkedIds = this.$refs.tree.getCurrentKey();
+                    this.checkedData = this.$refs.tree.getCurrentNode();
+                }
+                this.$emit('popoverHide', this.checkedIds, this.checkedData,false);
+            },
+            cancelUserInfo () {
+                this.$emit('popoverHideCancel', this.checkedIds, this.checkedData,false);
+            },
+        },
+        watch: {
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+/deep/ .expanded{
+    background-image: none !important;
+    background-size:100% 100%;
+}
+.el-drawer__body{
+& > div:first-child{
+      display: flex;
+      flex: auto;
+      flex-direction: column;
+  }
+}
+::v-deep .el-drawer__header{
+&>span:first-child{
+     outline: none!important;
+ }
+}
+::v-deep .el-drawer{
+    outline: none!important;
+}
+
+//#tree {
+//  .el-checkbox .el-checkbox__inner {
+//    display: none;
+//  }
+//  div[role="group"] {
+//    .el-checkbox .el-checkbox__inner {
+//      display: inline-block;
+//    }
+//  }
+//}
+//
+//.el-tree-node {
+//  .is-leaf + .el-checkbox .el-checkbox__inner {
+//    display: inline-block;
+//  }
+//  .el-checkbox .el-checkbox__inner {
+//    display: none;
+//  }
+//}
+
+/deep/ .el-tree-node{
+  .is-leaf + .el-checkbox .el-checkbox__inner{
+    display: inline-block;
+  }
+  .el-checkbox .el-checkbox__inner{
+    display: none;
+  }
+}
+</style>

src/components/treeSelect/treeSelectNew.vue

@@ -18,7 +18,8 @@
                  :default-checked-keys="defaultCheckedKeys"
                  :highlight-current="true"
                  @node-click="handleNodeClick"
-                 @check-change="handleCheckChange"></el-tree>
+                 @check-change="handleCheckChange">
+        </el-tree>
         <div id="roleFormButton" class="demo-drawer-footer">
             <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
             <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelUserInfo">取消</el-button>
@@ -298,4 +299,25 @@
 ::v-deep .el-drawer{
     outline: none!important;
 }
+
+//#tree {
+//  .el-checkbox .el-checkbox__inner {
+//    display: none;
+//  }
+//  div[role="group"] {
+//    .el-checkbox .el-checkbox__inner {
+//      display: inline-block;
+//    }
+//  }
+//}
+//
+//.el-tree-node {
+//  .is-leaf + .el-checkbox .el-checkbox__inner {
+//    display: inline-block;
+//  }
+//  .el-checkbox .el-checkbox__inner {
+//    display: none;
+//  }
+//}
+
 </style>

src/pages/details/otherStandardDetails/index.vue

@@ -207,7 +207,7 @@
                           v-else-if="child.attrType === 'DATE_PICKER'"
                           class="modular-content-p-val"
                   >
-                {{ child.value ? child.value.substring(0, 10) : '-' }}
+                {{ child.value ? child.value : '-' }}
               </span>
                   <span
                           v-else-if="child.attrType !== 'FILE'"
@@ -2327,6 +2327,27 @@
           this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoById', {id: this.sarStandardsInfoEO.id}, {
             _this: this
           }, res => {
+            let SSRQ = res.data.attrInfoMap.SSRQ.split(',')
+            let SSRQStr = ''
+            let ZCCSSRQ = res.data.attrInfoMap.ZCCSSRQ.split(',')
+            let ZCCSSRQStr = ''
+            let XCXSSRQ = res.data.attrInfoMap.XCXSSRQ.split(',')
+            let XCXSSRQStr = ''
+            for (let i = 0; i < SSRQ.length; i++) {
+              SSRQStr += SSRQ[i].substring(0,10)+','
+            }
+            for (let i = 0; i < ZCCSSRQ.length; i++) {
+              ZCCSSRQStr += ZCCSSRQ[i].substring(0,10)+','
+            }
+            for (let i = 0; i < XCXSSRQ.length; i++) {
+              XCXSSRQStr += XCXSSRQ[i].substring(0,10)+','
+            }
+            SSRQStr = SSRQStr.substring(0,SSRQStr.length-1)
+            ZCCSSRQStr = ZCCSSRQStr.substring(0,ZCCSSRQStr.length-1)
+            XCXSSRQStr = XCXSSRQStr.substring(0,XCXSSRQStr.length-1)
+            res.data.attrInfoMap.SSRQ = SSRQStr
+            res.data.attrInfoMap.ZCCSSRQ = ZCCSSRQStr
+            res.data.attrInfoMap.XCXSSRQ = XCXSSRQStr
             this.sarStandardsInfoEO = res.data || {}
             this.itemExistList=this.sarStandardsInfoEO.attrInfoMap.itemExistList;
             console.log("hllo",this.sarStandardsInfoEO);

src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue

@@ -1142,7 +1142,8 @@ export default {
       this.selectedList = []
       this.selectedAllList = data
       for (let i = 0; i < data.length; i++) {
-        this.selectedList.push(data[i].id,data[i].editFlag)
+        this.selectedList.push(data[i].id)
+        this.selectedList1.push(data[i].editFlag)
       }
     },
     // 分页点击后方法
@@ -1407,6 +1408,7 @@ export default {
           confirmButtonClass: 'common-button-primary',
           roundButton: false
         }).then(() => {
+          this.loading = true
           this.deleteItemsModal = false
           this.$http.post('lawss/sarFileSplitItems/batchDeleteItems', {
             ids: this.selectedList.join(','),
@@ -1427,6 +1429,7 @@ export default {
               nodeId = currentNode.id
             }
             this.selectSarMenu.id = nodeId
+            this.loading = false
           }, e => {
           })
         }).catch(() => {})

src/pages/localTool/standContrast/pages/textComparison.vue

@@ -145,7 +145,7 @@ export default {
     }
   },
   methods: {
-    comparisonClick () {
+    comparisonClick (flag) {
       if (this.saveItemId === '' && this.saveItemIdRight === '') {
         return this.$Message.warning('请选择比对的条款内容')
       }
@@ -155,7 +155,8 @@ export default {
       this.spinShow = true
       let itemsEoPage = {
         oldItemId: this.saveItemId,
-        newItemId: this.saveItemIdRight
+        newItemId: this.saveItemIdRight,
+        flag: flag
       }
       this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
         _this: this
@@ -164,8 +165,8 @@ export default {
         this.oldRightId = '#right_' + this.saveItemIdRight
         this.oldLeftContent = $('#itemsLeftText_' + this.saveItemId).html()
         this.oldRightContent = $('#itemsRightText_' + this.saveItemIdRight).html()
-        $('#left_' + this.saveItemId).find('#itemsLeftText_' + this.saveItemId).html(res.data.leftString)
+        $('#itemsLeftText_' + this.saveItemId).html(res.data.leftString)
-        $('#right_' + this.saveItemIdRight).find('#itemsRightText_' + this.saveItemIdRight).html(res.data.rightString)
+        $('#itemsRightText_' + this.saveItemIdRight).html(res.data.rightString)
         this.text = res.data.similarityDegree
         if (parseFloat(res.data.similarityDegree) >= parseFloat('75%') && parseFloat(res.data.similarityDegree) !== parseFloat('100%')) {
           this.textcontent = '相似'
@@ -299,7 +300,7 @@ export default {
           scrollTop: scrollToContainer.offset().top - mainContainer.offset().top + mainContainer.scrollTop()
         })// 2秒滑动到指定位置
       }
-      this.comparisonClick()
+      this.comparisonClick(flag)
     },
     // 返回
     back () {

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

@@ -167,32 +167,61 @@
                     <div class="prc-content-border content_input" v-show="verifySarStandard" >
                         <el-row :gutter="24">
                             <el-col :span="12">
-                                <el-form-item label="实施日期(标准文本)" prop="ssrq" class="add-form-item form-item-disabled">
+                              <cus-tom-data-picker-group
-                                    <el-date-picker
+                                  :key="'ssrq'"
-                                            v-model="form.ssrq"
+                                  :config="{attrName:'实施日期(标准文本)',attrField:'ssrq'}"
-                                            type="dates"
+                                  v-model="form.ssrq"
-                                            placeholder="请选择标准实施日期(标准文本)"
+                                  :disabled="false"
-                                            value-format="yyyy-MM-dd">
+                              ></cus-tom-data-picker-group>
-                                    </el-date-picker>
+                              <cus-tom-data-picker-group
-                                </el-form-item>
+                                  :key="'zccssrq'"
-                                <el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">
+                                  :config="{attrName:'在产车实施日期(标准文本)',attrField:'zccssrq'}"
-                                    <el-date-picker
+                                  v-model="form.zccssrq"
-                                            v-model="form.zccssrq"
+                                  :disabled="false"
-                                            type="dates"
+                              ></cus-tom-data-picker-group>
-                                            placeholder="请选择在产车实施日期(标准文本)"
+
-                                            value-format="yyyy-MM-dd">
+<!--                                <el-form-item label="实施日期(标准文本)" prop="ssrq" class="add-form-item form-item-disabled">-->
-                                    </el-date-picker>
+<!--                                    <el-date-picker-->
-                                </el-form-item>
+<!--                                            v-model="form.ssrq"-->
+<!--                                            type="dates"-->
+<!--                                            placeholder="请选择标准实施日期(标准文本)"-->
+<!--                                            value-format="yyyy-MM-dd">-->
+<!--                                    </el-date-picker>-->
+<!--                                </el-form-item>-->
+<!--                                <el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">-->
+<!--                                    <el-date-picker-->
+<!--                                            v-model="form.zccssrq"-->
+<!--                                            type="dates"-->
+<!--                                            placeholder="请选择在产车实施日期(标准文本)"-->
+<!--                                            value-format="yyyy-MM-dd hh:mm:ss"-->
+<!--                                    >-->
+<!--                                    </el-date-picker>-->
+
+<!--                                </el-form-item>-->
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
+                              <cus-tom-data-picker-group
-                                    <el-date-picker
+                                  :config="{attrName:'新车型实施日期(标准文本)',attrField:'xcxssrq'}"
-                                            v-model="form.xcxssrq"
+                                  v-model="form.xcxssrq"
-                                            type="dates"
+                                  :disabled="false"
-                                            placeholder="请选择新车型实施日期(标准文本"
+                              ></cus-tom-data-picker-group>
-                                            value-format="yyyy-MM-dd">
+<!--                                <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">-->
-                                    </el-date-picker>
+<!--                                    <el-date-picker-->
-                                </el-form-item>
+<!--                                            v-model="form.xcxssrq"-->
+<!--                                            type="dates"-->
+<!--                                            placeholder="请选择新车型实施日期(标准文本"-->
+<!--                                            value-format="yyyy-MM-dd hh:mm:ss"-->
+<!--                                    >-->
+<!--                                    </el-date-picker>-->
+
+<!--                                </el-form-item>-->
+
+
+
+
+
+
+
 <!--                                <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
 <!--                                    <el-date-picker-->
 <!--                                            v-model="form.ssrqgj"-->
@@ -578,7 +607,7 @@
                                 </el-form-item>
                                 <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
                                     <el-input v-model="form.dybxh" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxh', '模块结构单元', form.dybxh)"></el-input>
-                                    <tree-select-new
+                                    <tree-select-module
                                             width = "800"
                                             :key="key3"
                                             :lazy=true
@@ -590,7 +619,7 @@
                                             :show-checkBox="showCheckBox"
                                             :urlChild="urlChild"
                                             :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
-                                            :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"></tree-select-new>
+                                            :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"></tree-select-module>
                                 </el-form-item>
                                 <el-form-item v-show="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
                                   <el-select :popper-append-to-body="false"  v-model="form.gkdw" placeholder="请选择归口管理部门">
@@ -1242,15 +1271,22 @@
     import {saveTaskFirst, queryTaskFirst} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
+    import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
+    import CustomDatePickGroup from '@/components/CustomFormComponents/DatePickerGroup'
+    import CusTomDataPickerGroup
+      from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
 
     export default {
         name: "bzrkStep1",
         components: {
+          CusTomDataPickerGroup,
+          CustomDatePickGroup,
+          TreeSelectModule,
             ProcessHeader,
             ProcessFooter,
             ProcessTitle,
             TreeSelect,
-            TreeSelectNew
+            TreeSelectNew,
         },
         data () {
           const validateQcdw = (rule, value, callback) => {
@@ -1725,6 +1761,7 @@
                 this.roleForm.zrUserName=nameList;
               }
               if (this.drawerTitle === '选择我司署名人'){
+                this.roleForm.wssmrId=idList;
                 this.form.wssmr = nameList
               }
             },
@@ -2698,21 +2735,26 @@
 
           },
             handleSubmit() {
+              debugger
               // this.form.country=this.countryArr;
                 this.$refs['form'].validate((valid) => {
                     if (valid) {
                         this.$refs['userForm'].validate((valid) => {
                             if (valid) {
+
                                 this.fileInfoHandle()
                                 this.isSubmit = true
                                 this.form.country=this.countryArr;
-                                var json = Object.assign(this.form, this.roleForm)
+                              console.log("this.form",this.form.wssmr);
+                              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
+
+                              console.log("JSON.stringify(json)",JSON.stringify(json));
                                 this.$http.get('lawss/activiti/startProcess', {type: '1'}, {
                                     _this: this
                                 }, res => {

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

@@ -152,35 +152,53 @@
                     <div class="prc-content-border">
                         <el-row :gutter="24">
                             <el-col :span="12">
-                                <el-form-item label="实施日期(标准文本)" prop="ssrq" class="add-form-item form-item-disabled">
+                              <cus-tom-data-picker-group
-                                    <el-date-picker
+                                  :key="'ssrq'"
-                                            disabled
+                                  :config="{attrName:'实施日期(标准文本)',attrField:'ssrq'}"
-                                            v-model="form.ssrq"
+                                  v-model="form.ssrq"
-                                            type="date"
+                                  :disabled="true"
-                                            placeholder="请选择标准实施日期(标准文本)"
+                              ></cus-tom-data-picker-group>
-                                            value-format="yyyy-MM-dd">
+                              <cus-tom-data-picker-group
-                                    </el-date-picker>
+                                  :key="'zccssrq'"
-                                </el-form-item>
+                                  :config="{attrName:'在产车实施日期(标准文本)',attrField:'zccssrq'}"
-                                <el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">
+                                  v-model="form.zccssrq"
-                                    <el-date-picker
+                                  :disabled="true"
-                                            disabled
+                              ></cus-tom-data-picker-group>
-                                            v-model="form.zccssrq"
+<!--                                <el-form-item label="实施日期(标准文本)" prop="ssrq" class="add-form-item form-item-disabled">-->
-                                            type="date"
+<!--                                    <el-date-picker-->
-                                            placeholder="请选择在产车实施日期(标准文本)"
+<!--                                            disabled-->
-                                            value-format="yyyy-MM-dd">
+<!--                                            v-model="form.ssrq"-->
-                                    </el-date-picker>
+<!--                                            type="dates"-->
-                                </el-form-item>
+<!--                                            placeholder="请选择标准实施日期(标准文本)"-->
+<!--                                            value-format="yyyy-MM-dd hh:mm:ss">-->
+<!--                                    </el-date-picker>-->
+<!--                                </el-form-item>-->
+<!--                                <el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">-->
+<!--                                    <el-date-picker-->
+<!--                                            disabled-->
+<!--                                            v-model="form.zccssrq"-->
+<!--                                            type="dates"-->
+<!--                                            placeholder="请选择在产车实施日期(标准文本)"-->
+<!--                                            value-format="yyyy-MM-dd hh:mm:ss">-->
+<!--                                    </el-date-picker>-->
+<!--                                </el-form-item>-->
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
+                              <cus-tom-data-picker-group
-                                    <el-date-picker
+                                  :key="'zccssrq'"
-                                            disabled
+                                  :config="{attrName:'新车型实施日期(标准文本)',attrField:'xcxssrq'}"
-                                            v-model="form.xcxssrq"
+                                  v-model="form.xcxssrq"
-                                            type="date"
+                                  :disabled="true"
-                                            placeholder="请选择新车型实施日期(标准文本"
+                              ></cus-tom-data-picker-group>
-                                            value-format="yyyy-MM-dd">
+<!--                                <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">-->
-                                    </el-date-picker>
+<!--                                    <el-date-picker-->
-                                </el-form-item>
+<!--                                            disabled-->
+<!--                                            v-model="form.xcxssrq"-->
+<!--                                            type="dates"-->
+<!--                                            placeholder="请选择新车型实施日期(标准文本"-->
+<!--                                            value-format="yyyy-MM-dd hh:mm:ss">-->
+<!--                                    </el-date-picker>-->
+<!--                                </el-form-item>-->
                                 <!--                                <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
                                 <!--                                    <el-date-picker-->
                                 <!--                                            disabled-->
@@ -769,6 +787,8 @@
     import ProcessTitle from '../../components/ProcessTitle'
     import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process'
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
+    import CusTomDataPickerGroup
+      from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
 
     export default {
         name: "bzrkStep2",
@@ -956,6 +976,7 @@
             }
         },
         components: {
+          CusTomDataPickerGroup,
             ProcessHeader,
             ProcessFooter,
             ProcessTitle,
@@ -1209,13 +1230,16 @@
                             _this: this
                         }, res => {
                             if (res.success) {
-                                if(this.formTongGuo.approvalOpinion === '1'){
+                              console.log("this.formTongGuo.approvalOpinion",this.formTongGuo.approvalOpinion);
-                                    this.$message.warning("驳回成功")
+                              if(this.formTongGuo.approvalOpinion == '1'){
+                                console.log("shibai");
+                                this.$message.warning("驳回成功")
                                     this.isSubmit = false
                                     // 流程提交之后，应该流转至待办任务页面
                                     this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
                                 }else{
-                                    this.processCreateStand(json)
+                                console.log("hello");
+                                this.processCreateStand(json)
                                 }
                             }
                         })

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

@@ -151,32 +151,53 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="12">
-                <el-form-item label="实施日期(标准文本)" prop="ssrq" class="add-form-item form-item-disabled">
+                <custom-date-pick-group
-                  <el-date-picker
+                    :key="'ssrq'"
-                      disabled
+                    :config="{attrName:'实施日期(标准文本)',attrField:'ssrq'}"
-                      v-model="form.ssrq"
+                    v-model="form.ssrq"
-                      type="date"
+                    :disabled="true"
-                      placeholder="请选择标准实施日期(标准文本)">
+                ></custom-date-pick-group>
-                  </el-date-picker>
+                <custom-date-pick-group
-                </el-form-item>
+                    :key="'zccssrq'"
-                <el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">
+                    :config="{attrName:'在产车实施日期(标准文本)',attrField:'zccssrq'}"
-                  <el-date-picker
+                    v-model="form.zccssrq"
-                      disabled
+                    :disabled="true"
-                      v-model="form.zccssrq"
+                ></custom-date-pick-group>
-                      type="date"
+<!--                <el-form-item label="实施日期(标准文本)" prop="ssrq" class="add-form-item form-item-disabled">-->
-                      placeholder="请选择在产车实施日期(标准文本)">
+<!--                  <el-date-picker-->
-                  </el-date-picker>
+<!--                      disabled-->
-                </el-form-item>
+<!--                      v-model="form.ssrq"-->
+<!--                      type="dates"-->
+<!--                      value-format="yyyy-MM-dd hh:mm:ss"-->
+<!--                      placeholder="请选择标准实施日期(标准文本)">-->
+<!--                  </el-date-picker>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">-->
+<!--                  <el-date-picker-->
+<!--                      disabled-->
+<!--                      v-model="form.zccssrq"-->
+<!--                      type="dates"-->
+<!--                      value-format="yyyy-MM-dd hh:mm:ss"-->
+<!--                      placeholder="请选择在产车实施日期(标准文本)">-->
+<!--                  </el-date-picker>-->
+<!--                </el-form-item>-->
               </el-col>
               <el-col :span="12">
-                <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
+                <custom-date-pick-group
-                  <el-date-picker
+                    :key="'zccssrq'"
-                          disabled
+                    :config="{attrName:'新车型实施日期(标准文本)',attrField:'zccssrq'}"
-                          v-model="form.xcxssrq"
+                    v-model="form.xcxssrq"
-                          type="date"
+                    :disabled="true"
-                          placeholder="请选择新车型实施日期(标准文本">
+                ></custom-date-pick-group>
-                  </el-date-picker>
+<!--                <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">-->
-                </el-form-item>
+<!--                  <el-date-picker-->
+<!--                          disabled-->
+<!--                          v-model="form.xcxssrq"-->
+<!--                          type="dates"-->
+<!--                          value-format="yyyy-MM-dd hh:mm:ss"-->
+<!--                          placeholder="请选择新车型实施日期(标准文本">-->
+<!--                  </el-date-picker>-->
+<!--                </el-form-item>-->
 <!--                <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
 <!--                  <el-date-picker-->
 <!--                      disabled-->
@@ -691,6 +712,8 @@ import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
 import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process'
 import TreeSelect from '@/components/treeSelect/treeSelect.vue';
+import CustomDatePickGroup from '@/components/CustomFormComponents/DatePickerGroup'
+
 
 export default {
   name: "bzrkStep3",
@@ -866,6 +889,7 @@ export default {
     }
   },
   components: {
+    CustomDatePickGroup,
     ProcessHeader,
     ProcessFooter,
     ProcessTitle,

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

@@ -155,29 +155,48 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="12">
-                <el-form-item label="实施日期(标准文本)" prop="ssrq" class="add-form-item form-item-disabled">
+                <cus-tom-data-picker-group
-                  <el-date-picker
+                    :key="'ssrq'"
-                      v-model="form.ssrq"
+                    :config="{attrName:'实施日期(标准文本)',attrField:'ssrq'}"
-                      type="date"
+                    v-model="form.ssrq"
-                      placeholder="请选择标准实施日期(标准文本)">
+                    :disabled="false"
-                  </el-date-picker>
+                ></cus-tom-data-picker-group>
-                </el-form-item>
+                <cus-tom-data-picker-group
-                <el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">
+                    :key="'zccssrq'"
-                  <el-date-picker
+                    :config="{attrName:'在产车实施日期(标准文本)',attrField:'zccssrq'}"
-                      v-model="form.zccssrq"
+                    v-model="form.zccssrq"
-                      type="date"
+                    :disabled="false"
-                      placeholder="请选择在产车实施日期(标准文本)">
+                ></cus-tom-data-picker-group>
-                  </el-date-picker>
+<!--                <el-form-item label="实施日期(标准文本)" prop="ssrq" class="add-form-item form-item-disabled">-->
-                </el-form-item>
+<!--                  <el-date-picker-->
+<!--                      v-model="form.ssrq"-->
+<!--                      type="dates"-->
+<!--                      placeholder="请选择标准实施日期(标准文本)">-->
+<!--                  </el-date-picker>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">-->
+<!--                  <el-date-picker-->
+<!--                      v-model="form.zccssrq"-->
+<!--                      type="dates"-->
+<!--                      placeholder="请选择在产车实施日期(标准文本)">-->
+<!--                  </el-date-picker>-->
+<!--                </el-form-item>-->
               </el-col>
               <el-col :span="12">
-                <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
+                <cus-tom-data-picker-group
-                  <el-date-picker
+                    :key="'xcxssrq'"
-                          v-model="form.xcxssrq"
+                    :config="{attrName:'新车型实施日期(标准文本)',attrField:'xcxssrq'}"
-                          type="date"
+                    v-model="form.xcxssrq"
-                          placeholder="请选择新车型实施日期(标准文本">
+                    :disabled="false">
-                  </el-date-picker>
+                </cus-tom-data-picker-group>
-                </el-form-item>
+
+<!--                <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">-->
+<!--                  <el-date-picker-->
+<!--                          v-model="form.xcxssrq"-->
+<!--                          type="dates"-->
+<!--                          placeholder="请选择新车型实施日期(标准文本">-->
+<!--                  </el-date-picker>-->
+<!--                </el-form-item>-->
 <!--                <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
 <!--                  <el-date-picker-->
 <!--                      v-model="form.ssrqgj"-->
@@ -787,7 +806,9 @@
                           width = "800"
                           :key="key1"
                           :lazy=true
-                          :multiple=false
+                          :multiple=true
+                          :check-strictly= true
+                          :show-checkBox=true
                           :modalShowFlag="modalShowFlag2"
                           :drawerTitle="drawerTitle"
                           :url="url"
@@ -802,7 +823,9 @@
                           width = "800"
                           :key="key2"
                           :lazy=true
-                          :multiple=false
+                          :multiple=true
+                          :check-strictly=true
+                          :show-checkBox=true
                           :modalShowFlag="modalShowFlag3"
                           :drawerTitle="drawerTitle"
                           :url="url"
@@ -813,17 +836,19 @@
                 </el-form-item>
                 <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
                   <el-input v-model="form.dybxh" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxh', '模块结构单元', form.dybxh)"></el-input>
-                  <tree-select-new
+                  <tree-select-module
                           width = "800"
                           :key="key3"
                           :lazy=true
-                          :multiple=false
+                          :multiple=true
+                          :check-strictly= true
+                          :show-checkBox=true
                           :modalShowFlag="modalShowFlag4"
                           :drawerTitle="drawerTitle"
                           :url="url"
                           :urlChild="urlChild"
                           :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
-                          :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel" ></tree-select-new>
+                          :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel" ></tree-select-module>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
                   <el-select :popper-append-to-body="false"  v-model="form.gkdw" placeholder="请选择归口管理部门">
@@ -909,15 +934,17 @@
                   ></el-input>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple>
+                  <el-input v-model="form.wssmr" placeholder="选择我司署名人" @click.native="choiceZRRS('wssmr', '选择我司署名人', form.wssmr)">
-                      <el-option
+                  </el-input>
-                              v-for="item in wssmrOptions"
+<!--                  <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple>-->
-                              placeholder="请选择"
+<!--                      <el-option-->
-                              :key="item.value"
+<!--                              v-for="item in wssmrOptions"-->
-                              :value="item.value"
+<!--                              placeholder="请选择"-->
-                              :label="item.label"
+<!--                              :key="item.value"-->
-                      ></el-option>
+<!--                              :value="item.value"-->
-                  </el-select>
+<!--                              :label="item.label"-->
+<!--                      ></el-option>-->
+<!--                  </el-select>-->
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
                   <el-select v-model="form.cysd" placeholder="请选择我司参与深度">
@@ -1340,6 +1367,12 @@
             @checkedRole="checkedRole"
             :nodeList="nodeList"
     ></Role-tree>
+    <Role-tree
+        :is-title="drawerTitle"
+        :is-visible.sync="modalShowRoleFlag"
+        @checkedRole="checkedRole2"
+        :nodeList="nodeList2"
+    ></Role-tree>
   </div>
 </template>
 
@@ -1357,10 +1390,15 @@ import {
 } from 'api/process'
 import TreeSelect from '@/components/treeSelect/treeSelect.vue';
 import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
+import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
+import CusTomDataPickerGroup
+  from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
 
 export default {
   name: "bzrkStep4",
   components: {
+    CusTomDataPickerGroup,
+    TreeSelectModule,
     ProcessHeader,
     ProcessFooter,
     ProcessTitle,
@@ -1474,7 +1512,7 @@ export default {
           { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
         ],
         standEnName: [
-          { required: true, message: '请输入标准英文名称', trigger: 'blur' },
+          { required: false, message: '请输入标准英文名称', trigger: 'blur' },
           { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
         ],
         /*standNature: [
@@ -1631,6 +1669,34 @@ export default {
         }
       })
     },
+    checkedRole2 (data) {
+      console.log('1712',this.drawerTitle)
+      let idList = ''
+      let nameList = ''
+      data.forEach( item => {
+        if (nameList.length > 0) {
+          nameList += ','
+          idList += ','
+        }
+        idList += item.id
+        nameList += item.name
+      })
+      if (this.drawerTitle === '选择责任人'){
+        this.roleForm.zrUserId=idList;
+        this.roleForm.zrUserName=nameList;
+      }
+      if (this.drawerTitle === '选择我司署名人'){
+        this.form.wssmr = nameList
+      }
+    },
+    choiceZRRS (type, title, id) {
+      console.log('2077',title)
+      this.nodeList = []
+      this.nodeList.push(id)
+      this.userType = type
+      this.drawerTitle = title
+      this.modalShowRoleFlag = true
+    },
     choiceZRR1 (type, title, id) {
       this.drawerTitle = title
       this.modalShowFlag1 = true
@@ -1663,6 +1729,7 @@ export default {
       this.urlChild="sarModelTree/childByList"
       this.key3++
     },
+
     busVsFunc(){
       this.$http.get('sarVppsTree/list', '', {
         _this: this

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -556,13 +556,13 @@
                       :disabled="formdisableflag"
                   ></custom-SVPPS>
                 </template>
-                <template v-else-if="field.attrField === 'XCXSSRQ' || field.attrField === 'ZCCSSRQ'">
+                <template v-else-if="field.attrField === 'XCXSSRQ' || field.attrField === 'ZCCSSRQ' || field.attrField === 'SSRQ'">
-                  <custom-date-pick
+                  <custom-date-pick-group
                       :key="field.attrField"
                       :config="field"
                       v-model="sarStandardsInfoEO[field.attrField]"
                       :disabled="formdisableflag"
-                  ></custom-date-pick>
+                  ></custom-date-pick-group>
                 </template>
                 <template v-else-if="field.attrType === 'DATE_PIC_OPTS'">
                   <custom-date-pick-group
@@ -735,14 +735,16 @@
                         class="add-form-item"
                     >
                       <template slot="label">责任工程师</template>
-                      <el-input
+                      <el-input v-model="sarStandardsInfoEO['ZRGCS']" placeholder="选择责任工程师" @click.native="choiceZRRS('zrgcs', '选择责任工程师', sarStandardsInfoEO['ZRGCS'])">
-                          :key="field.attrField"
-                          :config="field"
-                          clearable
-                          v-model="sarStandardsInfoEO['ZRGCS']"
-                          :disabled="formdisableflag" placeholder="选择责任工程师"
-                          @click.native="choiceRole('ZRGCSUserId', '责任工程师', sarStandardsInfoEO.ZRGCSUserId)">
                       </el-input>
+<!--                      <el-input-->
+<!--                          :key="field.attrField"-->
+<!--                          :config="field"-->
+<!--                          clearable-->
+<!--                          v-model="sarStandardsInfoEO['ZRGCS']"-->
+<!--                          :disabled="formdisableflag" placeholder="选择责任工程师"-->
+<!--                          @click.native="choiceRole('ZRGCSUserId', '责任工程师', sarStandardsInfoEO.ZRGCSUserId)">-->
+<!--                      </el-input>-->
                     </el-form-item>
                   </template>
                   <template v-else-if="field.attrField === 'WSSMR'">
@@ -752,14 +754,16 @@
                         class="add-form-item"
                     >
                       <template slot="label">我司署名人</template>
-                      <el-input
+                      <el-input v-model="sarStandardsInfoEO['WSSMR']" placeholder="选择我司署名人" @click.native="choiceZRRS('wssmr', '选择我司署名人', sarStandardsInfoEO['WSSMR'])">
-                          :key="field.attrField"
-                          :config="field"
-                          clearable
-                          v-model="sarStandardsInfoEO['WSSMR']"
-                          :disabled="formdisableflag" placeholder="选择我司署名人"
-                          @click.native="choiceRole('WSSMRUserId', '我司署名人', sarStandardsInfoEO.WSSMRUserId)">
                       </el-input>
+<!--                      <el-input-->
+<!--                          :key="field.attrField"-->
+<!--                          :config="field"-->
+<!--                          clearable-->
+<!--                          v-model="sarStandardsInfoEO['WSSMR']"-->
+<!--                          :disabled="formdisableflag" placeholder="选择我司署名人"-->
+<!--                          @click.native="choiceRole('WSSMRUserId', '我司署名人', sarStandardsInfoEO.WSSMRUserId)">-->
+<!--                      </el-input>-->
                     </el-form-item>
                   </template>
                   <template v-else>
@@ -1237,7 +1241,7 @@
           :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
           :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"
           @popoverHideCancel="popoverHideCarVsCancel()"></tree-select-new>
-      <tree-select-new
+      <tree-select-module
           width="500"
           :lazy=true
           :multiple=true
@@ -1248,7 +1252,7 @@
           :urlChild="urlChild"
           :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
           :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"
-          @popoverHideCancel="popoverHideModelCancel()"></tree-select-new>
+          @popoverHideCancel="popoverHideModelCancel()"></tree-select-module>
       <!--      导入失败-->
       <el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px">
         <p slot="title" style="color:#f60">
@@ -1819,6 +1823,12 @@
         @confirm="isTreeOk"
     ></org-table>
     <loading style="z-index: 2099;" :loading="importLoading">导入中...</loading>
+    <Role-tree
+        :is-title="drawerTitle"
+        :is-visible.sync="modalShowRoleFlag"
+        @checkedRole="checkedRole2"
+        :nodeList="nodeList2"
+    ></Role-tree>
     <Role-tree
         is-title="选择人员信息"
         :is-visible.sync="modalshowflagRole"
@@ -1906,6 +1916,7 @@ import CustomDatePickWithText2 from '@/components/CustomFormComponents/DatePicke
 import {interfaceUrl} from '@/sysConfig'
 import TreeSelect from '@/components/treeSelect/treeSelect.vue';
 import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
+import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
 import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle'
 
 
@@ -1931,6 +1942,7 @@ export default {
     TreeSelect,
     MechanismTree,
     TreeSelectNew,
+    treeSelectModule,
     ProcessTitle
   },
   data() {
@@ -1944,7 +1956,9 @@ export default {
       OCRModel: false,
       ocrList: [],
       nodeList: [],
+      nodeList2: [],
       nodeListZRBM: [],
+      modalShowRoleFlag: false,
       modalshowflagRole: false,
       modalshowflagZRBM: false,
       filterText: '', // 国内法规过滤
@@ -3133,6 +3147,27 @@ export default {
       this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoUpdateById', {id: row.id}, {
         _this: this
       }, res => {
+        let SSRQ = res.data.attrInfoMap.SSRQ.split(',')
+        let SSRQStr = ''
+        let ZCCSSRQ = res.data.attrInfoMap.ZCCSSRQ.split(',')
+        let ZCCSSRQStr = ''
+        let XCXSSRQ = res.data.attrInfoMap.XCXSSRQ.split(',')
+        let XCXSSRQStr = ''
+        for (let i = 0; i < SSRQ.length; i++) {
+          SSRQStr += SSRQ[i].substring(0,10)+','
+        }
+        for (let i = 0; i < ZCCSSRQ.length; i++) {
+          ZCCSSRQStr += ZCCSSRQ[i].substring(0,10)+','
+        }
+        for (let i = 0; i < XCXSSRQ.length; i++) {
+          XCXSSRQStr += XCXSSRQ[i].substring(0,10)+','
+        }
+        SSRQStr = SSRQStr.substring(0,SSRQStr.length-1)
+        ZCCSSRQStr = ZCCSSRQStr.substring(0,ZCCSSRQStr.length-1)
+        XCXSSRQStr = XCXSSRQStr.substring(0,XCXSSRQStr.length-1)
+        res.data.attrInfoMap.SSRQ = SSRQStr
+        res.data.attrInfoMap.ZCCSSRQ = ZCCSSRQStr
+        res.data.attrInfoMap.XCXSSRQ = XCXSSRQStr
         const item = res.data || {}
         this.collectId = item.collectId
         this.addOrUPdateFlag = 2
@@ -3971,8 +4006,9 @@ export default {
                 nowstandinfo.putTime = this.$dateFormat(this.sarStandardsInfoEO.putTime, 'yyyy-MM-dd hh:mm:ss')
               }
               // 代替标准号
-              if (nowstandinfo.replaceStandNum != null) {
+              console.log('4007',nowstandinfo.DTBJH);
-                nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/，/ig, ',')
+              if (nowstandinfo.DTBJH != null) {
+                nowstandinfo.DTBJH = nowstandinfo.DTBJH.replace(/，/ig, ',')
               }
               if (nowstandinfo.replaceStandNum != null && nowstandinfo.replaceStandNum !== '') {
                 nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/\r\n/g, '<br />')
@@ -5315,6 +5351,33 @@ export default {
         this.$set(this.textStatusMap, item.value, item.label)
       })
     },
+    choiceZRRS (type, title, id) {
+      console.log('2077',title)
+      this.nodeList = []
+      this.nodeList.push(id)
+      this.userType = type
+      this.drawerTitle = title
+      this.modalShowRoleFlag = true
+    },
+    checkedRole2 (data) {
+      console.log('1712',this.drawerTitle)
+      let idList = ''
+      let nameList = ''
+      data.forEach( item => {
+        if (nameList.length > 0) {
+          nameList += ','
+          idList += ','
+        }
+        idList += item.id
+        nameList += item.name
+      })
+      if (this.drawerTitle === '选择我司署名人'){
+        this.sarStandardsInfoEO['WSSMR'] = nameList
+      }else if (this.drawerTitle === '选择责任工程师'){
+        this.sarStandardsInfoEO['ZRGCS'] = nameList
+      }
+
+    },
     choiceRole(type, title, id) {
       this.nodeList = []
       this.nodeList.push(id)
@@ -5347,18 +5410,18 @@ export default {
     },
     drawerCheckZRBM(data) {
 
-      console.log("data", data);
+      console.log("5389", data);
       let idList = ''
       let nameList = ''
       data.forEach(item => {
-        if (item.hasChild === '0') {
+        // if (item.hasChild === '0') {
           if (nameList.length > 0) {
             nameList += ','
             idList += ','
           }
           idList += item.id
           nameList += item.name
-        }
+        // }
       })
 
       this.sarStandardsInfoEO.ZRBMId = idList;

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -1093,14 +1093,16 @@
                       class="add-form-item"
                     >
                       <template slot="label">责任工程师</template>
-                      <el-input
+                      <el-input v-model="sarStandardsInfoEO['ZRGCS']" placeholder="选择责任工程师" @click.native="choiceZRRS('zrgcs', '选择责任工程师', sarStandardsInfoEO['ZRGCS'])">
-                        :key="field.attrField"
-                        :config="field"
-                        clearable
-                        v-model="sarStandardsInfoEO['ZRGCS']"
-                        :disabled="formdisableflag" placeholder="选择责任工程师"
-                        @click.native="choiceRole('ZRGCSUserId', '责任工程师', sarStandardsInfoEO.ZRGCSUserId)">
                       </el-input>
+<!--                      <el-input-->
+<!--                        :key="field.attrField"-->
+<!--                        :config="field"-->
+<!--                        clearable-->
+<!--                        v-model="sarStandardsInfoEO['ZRGCS']"-->
+<!--                        :disabled="formdisableflag" placeholder="选择责任工程师"-->
+<!--                        @click.native="choiceRole('ZRGCSUserId', '责任工程师', sarStandardsInfoEO.ZRGCSUserId)">-->
+<!--                      </el-input>-->
                     </el-form-item>
                   </template>
                   <template v-else>
@@ -1599,6 +1601,12 @@
       @confirm="isTreeOk"
     ></org-table>
     <loading style="z-index: 2099;" :loading="exportLoading">导入中...</loading>
+    <Role-tree
+        :is-title="drawerTitle"
+        :is-visible.sync="modalShowRoleFlag"
+        @checkedRole="checkedRole2"
+        :nodeList="nodeList2"
+    ></Role-tree>
     <Role-tree
       is-title="选择人员信息"
       :is-visible.sync="modalshowflagRole"
@@ -1667,7 +1675,9 @@ export default {
     return {
       // 人员树形和部门树形参数
       nodeList: [],
+      nodeList2: [],
       nodeListZRBM: [],
+      modalShowRoleFlag: false,
       modalshowflagRole: false,
       modalshowflagZRBM: false,
 
@@ -2473,6 +2483,33 @@ export default {
         this.$set(this.textStatusMap, item.value, item.label)
       })
     },
+    choiceZRRS (type, title, id) {
+      console.log('2077',title)
+      this.nodeList = []
+      this.nodeList.push(id)
+      this.userType = type
+      this.drawerTitle = title
+      this.modalShowRoleFlag = true
+    },
+    checkedRole2 (data) {
+      console.log('1712',this.drawerTitle)
+      let idList = ''
+      let nameList = ''
+      data.forEach( item => {
+        if (nameList.length > 0) {
+          nameList += ','
+          idList += ','
+        }
+        idList += item.id
+        nameList += item.name
+      })
+      if (this.drawerTitle === '选择我司署名人'){
+        this.sarStandardsInfoEO['WSSMR'] = nameList
+      }else if (this.drawerTitle === '选择责任工程师'){
+        this.sarStandardsInfoEO['ZRGCS'] = nameList
+      }
+
+    },
     busVsFunc() {
       this.$http.get('sarVppsTree/list', '', {
         _this: this