Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop

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

@@ -44,6 +44,34 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
+                                <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.number1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.number1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.name1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.name1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
                             </el-col>
                         </el-row>
                     </div>
@@ -232,6 +260,59 @@
                 </div>
             </div>
         </el-drawer>
+        <el-drawer
+                title="标准拆分数据库"
+                :visible.sync="listModel2"
+                size="900px"
+                custom-class="demo-drawer"
+        >
+            <div class="standardForComments">
+                <div class="content">
+                    <!-- 顶部工具栏 -->
+                    <div class="table-wrap">
+                        <div style="position: absolute;height: calc(100% - 10px);width: 100%;">
+                            <el-table
+                                    v-if="listModel2"
+                                    ref="selection"
+                                    :data="standInfoList2"
+                                    tooltip-effect="dark"
+                                    style="width: 100%;padding:0 0 20px 0;"
+                                    height="100%"
+                                    border
+                                    @selection-change="handleSelection2"
+                                    :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+                                <el-table-column type="selection" width="55" align="center"/>
+                                <el-table-column
+                                        prop="showNumber"
+                                        label="标准号/政策号"
+                                        width="170"
+                                        align="center">
+                                    <template slot-scope="scope">
+                                        <div v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNumSplit }}</div>
+                                        <div v-else>{{ scope.row.showNumber }}</div>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column
+                                        prop="standName"
+                                        label="标准名称/政策名称"
+                                        show-overflow-tooltip
+                                        align="center">
+                                    <template slot-scope="scope">
+                                        <span v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNameSplit }}</span>
+                                        <span v-else>{{ scope.row.standName }}</span>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                        </div>
+                    </div>
+                </div>
+                <pagination :page="standCommonlySearch2.page" :total="total2" @pageChange="pageChange2" @pageSizeChange="pageSizeChange2"></pagination>
+                <div class="demo-drawer-footer">
+                    <el-button size="mini" @click="closeDrawer2">取消</el-button>
+                    <el-button type="primary" size="mini" @click="enterDrawer2">确定</el-button>
+                </div>
+            </div>
+        </el-drawer>
         <el-drawer
                 :title="drawerTitle"
                 :visible.sync="modalshowflag"
@@ -297,6 +378,9 @@
         name: "bzjdStep1",
         data() {
             return {
+                listModel2: false,
+                standInfoList2: [],
+                sarType: '',
                 loading: false,
                 standId: '',
                 commentText: '',
@@ -311,6 +395,9 @@
                     number: '',
                     name: '',
                     id: '',
+                    number1: '',
+                    name1: '',
+                    id1: ''
                 },
                 formRules: {
                     number: [
@@ -325,13 +412,21 @@
                     numOrName: '',
                     page: 1,
                     pageSize: this.$store.getters.userInfo.configContent,
-                    result: '1'
+                    result: '1',
+                },
+                standCommonlySearch2: {
+                    page: 1,
+                    pageSize: this.$store.getters.userInfo.configContent,
+                    result: '1',
+                    sarType: 'INLAND'
                 },
                 spinShow: false,
                 standInfoList: [],
                 tableHeight: null,
                 total: 0,
+                total2: 0,
                 selectedList: [],
+                selectedList2: [],
                 data: [],
                 roleForm: {
                     applyUserIdName: this.$store.getters.userInfo.userName,
@@ -370,14 +465,6 @@
             ProcessFooter,
             ProcessTitle
         },
-        mounted () {
-            this.getTree()
-            this.sarStandCompareHis()
-            this.tableHeight = $('.content').height() - 44
-            window.onresize = () => {
-                this.tableHeight = $('.content').height() - 44
-            }
-        },
         methods: {
             addZqyjList() {
                 this.title = '标准拆分数据库'
@@ -412,6 +499,16 @@
                 }, e => {
                 })
             },
+            sarStandCompareHis2 () {
+                var form = this.standCommonlySearch2
+                this.$http.get('lawss/sarFileSplitInfo/getSarFileSplitInfoEOPage', form, {
+                    _this: this
+                }, res => {
+                    this.standInfoList2 = res.data.list
+                    this.total2 = res.data.total
+                }, e => {
+                })
+            },
             pageChange (page) {
                 this.standCommonlySearch.page = page
                 this.sarStandCompareHis()
@@ -419,9 +516,19 @@
             // 分页每页显示数改变后方法
             pageSizeChange (pageSize) {
                 this.$store.getters.userInfo.configContent = pageSize
-                this.standCommonlySearch.size = pageSize
+                this.standCommonlySearch.pageSize = pageSize
                 this.sarStandCompareHis()
             },
+            pageChange2 (page) {
+                this.standCommonlySearch2.page = page
+                this.sarStandCompareHis2()
+            },
+            // 分页每页显示数改变后方法
+            pageSizeChange2 (pageSize) {
+                this.$store.getters.userInfo.configContent = pageSize
+                this.standCommonlySearch2.pageSize = pageSize
+                this.sarStandCompareHis2()
+            },
             /** 选择带入数据的方法操作
              * */
             handleSelection(data) {
@@ -430,6 +537,12 @@
                     this.selectedList.push(data[i].id);
                 }
             },
+            handleSelection2 (data) {
+                this.selectedList2 = [];
+                for (let i = 0; i < data.length; i++) {
+                    this.selectedList2.push(data[i].id);
+                }
+            },
             closeDrawer() {
                 this.listModel = false
             },
@@ -452,8 +565,10 @@
                         this.form.name = bringData[0].standName
                     }
                     this.form.id = bringData[0].id
+                    this.sarType = bringData[0].sarType
                     this.standId = bringData[0].standId
                     this.listModel = false;
+                    this.listModel2 = true
                     this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
                         infoId: this.form.id,
                         page: 1,
@@ -476,6 +591,34 @@
                     this.$message.warning("请选择一条数据进行带入");
                 }
             },
+            closeDrawer2() {
+                this.listModel2 = false
+            },
+            enterDrawer2() {
+                if (this.selectedList2.length === 1) {
+                    let deposit = new Map();
+                    this.standInfoList2.forEach(item => {
+                        deposit.set(item.id, item);
+                    });
+                    let bringData = [];
+                    for (let i = 0; i < this.selectedList2.length; i++) {
+                        bringData.push(deposit.get(this.selectedList2[i]));
+                    }
+                    if (bringData[0].splitStatus === '0') {
+                        this.form.number1 = bringData[0].standNumSplit
+                        this.form.name1 = bringData[0].standNameSplit
+                    } else {
+                        this.form.number1 = bringData[0].showNumber
+                        this.form.name1 = bringData[0].standName
+                    }
+                    this.form.id1 = bringData[0].id
+                    this.listModel2 = false
+                } else if (this.selectedList2.length > 1) {
+                    this.$message.warning("只能选择一条数据进行带入");
+                } else {
+                    this.$message.warning("请选择一条数据进行带入");
+                }
+            },
             /*** **********************************************/
             /** 流程节点负责人的选择 *****************************/
             choiceZRR (type, title, id) {
@@ -595,7 +738,7 @@
                                         if (res.ok) {
                                             var json = Object.assign(this.form, this.roleForm)
                                             json.commentText = this.commentText
-                                            json.standInData = this.standId
+                                            json.standInData = this.sarType
                                             json.itemList = this.itemList
                                             this.$http.post('lawss/activiti/completeTask', {
                                                 json: JSON.stringify(json),
@@ -621,7 +764,16 @@
                     }
                 })
             }
-        }
+        },
+        mounted () {
+            this.getTree()
+            this.sarStandCompareHis()
+            this.sarStandCompareHis2()
+            this.tableHeight = $('.content').height() - 44
+            window.onresize = () => {
+                this.tableHeight = $('.content').height() - 44
+            }
+        },
     }
 </script>
 

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

@@ -13,7 +13,6 @@
                 <el-form
                         ref="bzzqyjForm"
                         :model="form"
-                        :rules="formRules"
                         class="label-input-form"
                         label-width="210px"
                 >
@@ -39,6 +38,34 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
+                                <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.number1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.number1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.name1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.name1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
                             </el-col>
                         </el-row>
                     </div>
@@ -158,6 +185,7 @@
         name: "bzjdStep2",
         data() {
             return {
+                sarType: '',
                 zxIndex: '',
                 zxType: '',
                 zxIdList: [],
@@ -181,15 +209,8 @@
                 isSubmit: false,
                 saveLoading: false,
                 form: {
-                    number: '', // 编号
+                    number: '',
-                    name: '', // 结束日期
+                    name: '',
-                    zxUserId: '',
-                    zxUserIdName: ''
-                },
-                formRules: {
-                    zxUserId: [
-                        { required: true, message: '请选择执行人', trigger: 'change' },
-                    ]
                 },
                 json: {},
                 itemList: []
@@ -311,6 +332,9 @@
                         let data = JSON.parse(res.mesg)
                         this.form.number = data.number
                         this.form.name = data.name
+                        this.form.number1 = data.number1
+                        this.form.name1 = data.name1
+                        this.sarType = data.standInData
                         this.json = data
                         var arr = []
                         arr = JSON.parse(data.itemList)

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

@@ -13,7 +13,6 @@
                 <el-form
                         ref="bzzqyjForm"
                         :model="form"
-                        :rules="formRules"
                         class="label-input-form"
                         label-width="210px"
                 >
@@ -39,6 +38,34 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
+                                <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.number1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.number1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.name1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.name1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
                             </el-col>
                         </el-row>
                     </div>
@@ -48,7 +75,7 @@
                 <template slot="title">拆分信息</template>
             </ProcessTitle>
             <div class="action-bar">
-                <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">批量编辑</el-button>
+                <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRR">批量编辑</el-button>
             </div>
             <el-table border
                       ref="selection"
@@ -64,21 +91,76 @@
                 <el-table-column
                         prop="itemsNum"
                         label="条款号"
-                        width="170"
+                        width="70"
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
-                        width="170"
+                        width="100"
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itermsConditions"
+                        width="150"
                         label="条款内容"
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
+                <el-table-column
+                        prop="itermsConditions"
+                        width="150"
+                        label="核心技术要求"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="itermsConditions"
+                        width="150"
+                        label="基于上一版本差异"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="itermsConditions"
+                        width="150"
+                        label="相对于国行标差异点"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="itermsConditions"
+                        width="150"
+                        label="符合项状态"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="itermsConditions"
+                        width="150"
+                        label="合规性分析"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="itermsConditions"
+                        width="150"
+                        label="新车型实施日期"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="itermsConditions"
+                        width="150"
+                        label="在产车型实施日期"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="itermsConditions"
+                        width="150"
+                        label="适用车型"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        label="责任部门"
+                        width="170"
+                        prop="deptName"
+                        align="center">
+                </el-table-column>
                 <el-table-column
                         label="责任人"
                         width="170"
@@ -110,31 +192,6 @@
                 @submit="handleSubmit"
         >
         </ProcessFooter>
-        <el-drawer
-                title="选择责任人"
-                :visible.sync="modalshowflag"
-                :wrapperClosable="false"
-                size="800px">
-            <el-tree
-                    v-if="modalshowflag"
-                    style="height: 100%; overflow: auto;"
-                    node-key="id"
-                    class="filter-tree"
-                    :data="treeData"
-                    :props="defaultProps"
-                    :default-checked-keys="nodeList"
-                    highlight-current
-                    check-strictly
-                    default-expand-all
-                    :expand-on-click-node="false"
-                    show-checkbox
-                    ref="tree">
-            </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="cancleUserInfo">取消</el-button>
-            </div>
-        </el-drawer>
     </div>
 </template>
 
@@ -148,36 +205,21 @@
         name: "bzjdStep3",
         data() {
             return {
+                sarType: '',
                 itemList: [],
                 loading: false,
                 commentText: '',
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
-                roleRow: {},
-                nodeList: [],
-                type: '',
-                defaultProps: {
-                    children: 'children',
-                    label: 'name'
-                },
-                treeData: [], // 人员数据
-                modalshowflag: false, // drawer开关
-                drawerTitle: '', //drawer标题
                 textarea: '', // 意见
-                ListModel: false, // 新增编辑抽屉开关
                 active: '1', // 默认显示
                 isSubmit: false,
                 saveLoading: false,
                 form: {
-                    number: '', // 编号
+                    number: '',
-                    name: '', // 结束日期
+                    name: '',
-                    zxUserId: '',
+                    number1: '',
-                    zxUserIdName: ''
+                    name1: ''
-                },
-                formRules: {
-                    zxUserId: [
-                        { required: true, message: '请选择执行人', trigger: 'change' },
-                    ]
                 },
                 json: {}
             }
@@ -189,36 +231,6 @@
         },
         methods: {
             handleSelectionChange () {},
-            saveUserInfo () {
-                var idList = ''
-                var nameList = ''
-                this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()).forEach( item => {
-                    if (nameList.length > 0) {
-                        nameList += ','
-                        idList += ','
-                    }
-                    idList += item.id
-                    nameList += item.name
-                })
-                this.form.zxUserId = idList
-                this.form.zxUserIdName = nameList
-                this.modalshowflag = false
-            },
-            cancleUserInfo () {
-                this.modalshowflag = false
-            },
-            choiceZRR () {
-                this.nodeList = []
-                if (this.form.zxUserId.length > 0) {
-                    this.nodeList = this.form.zxUserId.split(',')
-                }
-                this.modalshowflag = true
-            },
-            getTree () {
-                this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
-                    this.treeData = res.data
-                })
-            },
             handleTabs(name) {
                 this.active = name
             },
@@ -261,15 +273,20 @@
                         let data = JSON.parse(res.mesg)
                         this.form.number = data.number
                         this.form.name = data.name
+                        this.form.number1 = data.number1
+                        this.form.name1 = data.name1
+                        this.sarType = data.standInData
                         this.json = data
                         this.itemList = JSON.parse(data.itemList)
+                        this.itemList.forEach( item => {
+                            item.deptName = this.$store.getters.userInfo.orgName
+                        })
                     }).catch(e => {
                     })
                 })
             },
         },
         mounted () {
-            this.getTree()
             this.getData()
         }
     }

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

@@ -9,7 +9,7 @@
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
       <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
-    <div class="content" v-if="active == '1'">
+    <div class="content" v-show="active == '1'">
       <div style="flex: auto; overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
@@ -53,15 +53,15 @@
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item label="附件" prop="fileId" class="add-form-item form-item-disabled">
+              <el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
                <el-input
-                 v-if="listForm.fileId == null || this.listForm.fileId== 'undefined' || this.listForm.fileId == '' "
+                 v-if="listForm.modelName == null || this.listForm.modelName== 'undefined' || this.listForm.modelName == '' "
                  placeholder="暂无数据"
                >
                </el-input>
                 <el-input
                   v-else
-                  v-model="listForm.fileId"
+                  v-model="listForm.modelName"
                   placeholder=""
                 ></el-input>
               </el-form-item>

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

@@ -9,7 +9,7 @@
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
       <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
-    <div class="content" v-if="active == '1'">
+    <div class="content" v-show="active == '1'">
       <div style="flex: auto; overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
@@ -51,9 +51,9 @@
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item label="附件" prop="fileId" class="add-form-item form-item-disabled">
+              <el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
                 <el-upload
-                  v-if="listForm.fileId == null || this.listForm.fileId== 'undefined' || this.listForm.fileId == '' "
+                  v-if="listForm.modelName == null || this.listForm.modelName== 'undefined' || this.listForm.modelName == '' "
                   :action="uploadFileListPath"
                   show-file-list
                   :file-list="fileInfoList"
@@ -69,7 +69,7 @@
                 </el-upload>
                 <el-input
                   v-else
-                  v-model="listForm.fileId"
+                  v-model="listForm.modelName"
                   placeholder=""
                 ></el-input>
               </el-form-item>

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

@@ -9,7 +9,7 @@
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
       <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
-    <div class="content" v-if="active == '1'">
+    <div class="content" v-show="active == '1'">
       <div style="flex: auto; overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
@@ -53,16 +53,16 @@
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item label="附件" prop="fileId" class="add-form-item form-item-disabled">
+              <el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
                 <el-input
-                  v-if="listForm.fileId == null || this.listForm.fileId== 'undefined' || this.listForm.fileId == '' "
+                  v-if="listForm.modelName == null || this.listForm.modelName== 'undefined' || this.listForm.modelName == '' "
-                  v-model="listForm.fileId"
+                  v-model="listForm.modelName"
                   placeholder="暂无数据"
                 >
                 </el-input>
                 <el-input
                   v-else
-                  v-model="listForm.fileId"
+                  v-model="listForm.modelName"
                   placeholder=""
                 ></el-input>
               </el-form-item>