Merge branch 'develop' into 'test'

Develop

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

src/pages/config/pages/attributeCustom/components/stand.vue

@@ -104,7 +104,7 @@
           label-width="150px"
         >
           <input v-model="attributeEO.id" v-show="false">
-          <el-form-item label="所属模块" class="add-form-item">
+          <el-form-item label="所属模块" prop="sarType" class="add-form-item">
             <el-select
               v-model="attributeEO.sarType"
               placeholder="请选择"
@@ -118,13 +118,13 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="属性字段"  class="add-form-item" :class="{'form-item-disabled': addOrEdit === 'edit'}">
+          <el-form-item label="属性字段" prop="attrField"  class="add-form-item" :class="{'form-item-disabled': addOrEdit === 'edit'}">
             <el-input v-model.trim="attributeEO.attrField" :disabled="addOrEdit === 'edit'" placeholder="请输入属性字段" clearable/>
           </el-form-item>
-          <el-form-item label="属性名称" class="add-form-item">
+          <el-form-item label="属性名称" prop="attrName" class="add-form-item">
             <el-input v-model.trim="attributeEO.attrName" placeholder="请输入属性名称" clearable/>
           </el-form-item>
-          <el-form-item label="属性类型" class="add-form-item" :class="{'form-item-disabled': addOrEdit === 'edit'}">
+          <el-form-item label="属性类型" prop="attrType" class="add-form-item" :class="{'form-item-disabled': addOrEdit === 'edit'}">
             <el-select v-model="attributeEO.attrType" placeholder="请选择" :disabled="addOrEdit === 'edit'" filterable>
               <el-option
                 v-for="item in attrTypeOptions"
@@ -134,7 +134,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="选项值"  class="add-form-item" v-if="attributeEO.attrType === 'SEL_OPTION' || attributeEO.attrType === 'SEL_OPTS'">
+          <el-form-item label="选项值" prop="selVal" class="add-form-item" v-if="attributeEO.attrType === 'SEL_OPTION' || attributeEO.attrType === 'SEL_OPTS'">
             <el-select v-model="attributeEO.selVal" placeholder="请选择"  filterable>
               <el-option
                 v-for="item in relateDicIdOptions"
@@ -149,18 +149,18 @@
           <!--                  <Option v-for="opt in isMustOptions" :key="opt.value" :value="opt.value">{{ opt.label }}</Option>-->
           <!--                </Select>-->
           <!--              </el-form-item>-->
-          <el-form-item label="字段长度" class="add-form-item">
+          <el-form-item label="字段长度" prop="attrLen" class="add-form-item">
             <el-input v-model.number="attributeEO.attrLen" :disabled="addOrEdit === 'edit'" placeholder="只允许输入正整数" number  :maxlength="4"/>
           </el-form-item>
-          <el-form-item label="展示顺序" class="add-form-item">
+          <el-form-item label="展示顺序" prop="orderNum" class="add-form-item">
             <el-input v-model.number="attributeEO.orderNum" placeholder="只允许输入正整数" number  :maxlength="3"/>
           </el-form-item>
-          <el-form-item label="是否必填"  class="add-form-item">
+          <el-form-item label="是否必填" prop="isMust" class="add-form-item">
             <el-select v-model="attributeEO.isMust">
               <el-option v-for="opt in isMustOptions" :key="opt.value" :value="opt.value" :label="opt.label">{{ opt.label }}</el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="是否展示" class="add-form-item">
+          <el-form-item label="是否展示" prop="isShowImp" class="add-form-item">
             <el-select v-model="attributeEO.isShowImp">
               <el-option
                 v-for="opt in isMustOptions"
@@ -170,7 +170,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="展示区域"  class="add-form-item" v-if="attributeEO.isShowImp === '0'">
+          <el-form-item label="展示区域" prop="showRegionId" class="add-form-item" v-if="attributeEO.isShowImp === '0'">
             <el-select v-model="attributeEO.showRegionId">
               <el-option
                 v-for="opt in showRegionOptions"

src/pages/config/pages/mechanismManage/index.vue

@@ -200,6 +200,7 @@ export default {
         uname: "",
         email: ""
       }
+      this.page = 1
       this.getData()
     },
     resetFormPost () {

src/pages/config/pages/roleManage/index.vue

@@ -38,7 +38,7 @@
                    class="common-button-primary add-button"
                    @click="roleAddData"
                    v-btn-permission="'bb2571b08179edb36880aae169cb2e54'"
-                   size="mini">配置数据权限
+                   size="mini">配置法规库权限
         </el-button>
         <el-button type="primary"
                    class="common-button-primary add-button"
@@ -195,7 +195,8 @@
                       placeholder="请输入角色名称"
                       clearable></el-input>
           </el-form-item>
-          <el-form-item label="上级角色" prop="parentId" label-width="100px" class="add-form-item">
+<!--          当前的需求是不允许更改父级节点-->
+          <el-form-item v-show="this.type === 1" label="上级角色" prop="parentId" label-width="100px" class="add-form-item">
             <el-input v-model="addForm.parentId" style="display: none;"
                       clearable></el-input>
             <el-input v-model="addForm.parent"

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

@@ -163,7 +163,7 @@
         <el-table-column
           show-overflow-tooltip
           prop="technicalRequir"
-          width="150"
+          width="200"
           label="核心技术要求"
           align="center">
         </el-table-column>
@@ -196,13 +196,13 @@
         <el-table-column
           show-overflow-tooltip
           prop="complianceState"
-          width="150"
+          width="200"
           label="合规性分析"
           align="center">
         </el-table-column>
         <el-table-column
           prop="newData"
-          width="250"
+          width="150"
           label="新车型实施日期"
           align="center">
           <template slot-scope="scope">
@@ -211,7 +211,7 @@
         </el-table-column>
         <el-table-column
           prop="onlineData"
-          width="250"
+          width="150"
           label="在产车型实施日期"
           align="center">
           <template slot-scope="scope">

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

@@ -167,7 +167,7 @@
                 <el-table-column
                         v-if="!form.itemsNum1"
                         prop="technicalRequir"
-                        width="150"
+                        width="200"
                         label="核心技术要求"
                         align="center">
                     <template slot-scope="scope">
@@ -211,7 +211,7 @@
                 </el-table-column>
                 <el-table-column
                         prop="complianceState"
-                        width="150"
+                        width="200"
                         label="合规性分析"
                         align="center">
                     <template slot-scope="scope">
@@ -222,7 +222,7 @@
                 </el-table-column>
                 <el-table-column
                         prop="newData"
-                        width="250"
+                        width="150"
                         label="新车型实施日期"
                         align="center">
                     <template slot-scope="scope">
@@ -235,7 +235,7 @@
                 </el-table-column>
                 <el-table-column
                         prop="onlineData"
-                        width="250"
+                        width="150"
                         label="在产车型实施日期"
                         align="center">
                     <template slot-scope="scope">
@@ -364,7 +364,7 @@
                 :wrapperClosable="false"
                 size="800px">
             <div class="demo-drawer-content">
-                <el-form :model="plForm" class="label-input-form" ref="plForm" label-width="150">
+                <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150">
                     <el-formItem label="核心技术要求" prop="technicalRequir" class="add-form-item"  v-if="!form.itemsNum1">
                         <el-input
                                 v-model="plForm.technicalRequir"

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

@@ -162,7 +162,7 @@
                 <el-table-column
                         show-overflow-tooltip
                         prop="technicalRequir"
-                        width="150"
+                        width="200"
                         label="核心技术要求"
                         align="center">
                 </el-table-column>
@@ -195,13 +195,13 @@
                 <el-table-column
                         show-overflow-tooltip
                         prop="complianceState"
-                        width="150"
+                        width="200"
                         label="合规性分析"
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="newData"
-                        width="250"
+                        width="150"
                         label="新车型实施日期"
                         align="center">
                     <template slot-scope="scope">
@@ -210,7 +210,7 @@
                 </el-table-column>
                 <el-table-column
                         prop="onlineData"
-                        width="250"
+                        width="150"
                         label="在产车型实施日期"
                         align="center">
                     <template slot-scope="scope">

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

@@ -162,7 +162,7 @@
                 <el-table-column
                         show-overflow-tooltip
                         prop="technicalRequir"
-                        width="150"
+                        width="200"
                         label="核心技术要求"
                         align="center">
                 </el-table-column>
@@ -195,13 +195,13 @@
                 <el-table-column
                         show-overflow-tooltip
                         prop="complianceState"
-                        width="150"
+                        width="200"
                         label="合规性分析"
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="newData"
-                        width="250"
+                        width="150"
                         label="新车型实施日期"
                         align="center">
                     <template slot-scope="scope">
@@ -210,7 +210,7 @@
                 </el-table-column>
                 <el-table-column
                         prop="onlineData"
-                        width="250"
+                        width="150"
                         label="在产车型实施日期"
                         align="center">
                     <template slot-scope="scope">

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

@@ -163,7 +163,7 @@
                 <el-table-column
                         show-overflow-tooltip
                         prop="technicalRequir"
-                        width="150"
+                        width="200"
                         label="核心技术要求"
                         align="center">
                 </el-table-column>
@@ -196,13 +196,13 @@
                 <el-table-column
                         show-overflow-tooltip
                         prop="complianceState"
-                        width="150"
+                        width="200"
                         label="合规性分析"
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="newData"
-                        width="250"
+                        width="150"
                         label="新车型实施日期"
                         align="center">
                     <template slot-scope="scope">
@@ -211,7 +211,7 @@
                 </el-table-column>
                 <el-table-column
                         prop="onlineData"
-                        width="250"
+                        width="150"
                         label="在产车型实施日期"
                         align="center">
                     <template slot-scope="scope">

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

@@ -1238,7 +1238,27 @@
             TreeSelectNew
         },
         data () {
-            return {
+          const validateQcdw = (rule, value, callback) => {
+            if(this.form.standInData === '0'){
+              if (value === null ||  value.length === 0) {
+                callback(new Error('请选择起草单位！'))
+              } else {
+                callback()
+              }
+            }
+            callback()
+          };
+          const validateCysd = (rule, value, callback) => {
+            if(this.form.standInData === '0'){
+              if (value === '') {
+                callback(new Error('请选择我司参与深度！'))
+              } else {
+                callback()
+              }
+            }
+            callback()
+          }
+          return {
               fileList: [],
               caFileList: [],
               FBGBJBDFileList: [],
@@ -1477,10 +1497,10 @@
                         { required: true, message: '请选择标准发布日期', trigger: 'change' }
                     ],
                     qcdw: [
-                        { required: true, message: '请选择起草单位', trigger: 'change' }
+                        { required: true, message: '请选择起草单位', validator: validateQcdw, trigger: 'change' }
                     ],
                     cysd: [
-                        { required: true, message: '请选择我司参与深度', trigger: 'change' }
+                        { required: true, message: '请选择我司参与深度', validator: validateCysd, trigger: 'change' }
                     ],
                 },
                 zrUserIds: [], // 选择多个会签责任人

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

@@ -91,12 +91,15 @@
           </el-table-column>
           <el-table-column
             prop="chapterNumber"
+            align="center"
             label="章条编号"
-            width="170px">
+            width="101px">
           </el-table-column>
           <el-table-column
             prop="chapterName"
-            label="章节名称">
+            align="center"
+            label="章节名称"
+            width="200px">
           </el-table-column>
           <el-table-column
             align="center"
@@ -120,14 +123,17 @@
           </el-table-column>
           <el-table-column
             prop="department"
+            align="center"
             label="提出部门">
           </el-table-column>
           <el-table-column
             prop="responUserName"
+            align="center"
             label="提出人">
           </el-table-column>
           <el-table-column
             prop="state"
+            align="center"
             label="处理意见">
             <template slot-scope="scope">
               <div>{{ stateText(scope.row.state) }}</div>

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

@@ -97,7 +97,7 @@
                             align="center"
                             sortable
                             label="章条编号"
-                            width="170px">
+                            width="101px">
                         <template slot-scope="scope">
                             <el-input style="margin: 10px 0;" v-model="scope.row.chapterNumber"></el-input>
                         </template>
@@ -106,7 +106,7 @@
                             prop="chapterName"
                             align="center"
                             label="章节名称"
-                            width="170px">
+                            width="200px">
                         <template slot-scope="scope">
                             <el-input style="margin: 10px 0;" v-model="scope.row.chapterName"></el-input>
                         </template>

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

@@ -79,12 +79,13 @@
             align="center"
             sortable
             label="章条编号"
-            width="170px">
+            width="101px">
           </el-table-column>
           <el-table-column
             prop="chapterName"
             align="center"
-            label="章节名称">
+            label="章节名称"
+            width="200px">
           </el-table-column>
           <el-table-column
             align="center"

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

@@ -79,11 +79,12 @@
             align="center"
             sortable
             label="章条编号"
-            width="170px">
+            width="101px">
           </el-table-column>
           <el-table-column
             prop="chapterName"
             align="center"
+            width="200px"
             label="章节名称">
           </el-table-column>
           <el-table-column

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

@@ -91,11 +91,12 @@
             align="center"
             sortable
             label="章条编号"
-            width="170px">
+            width="101px">
           </el-table-column>
           <el-table-column
             prop="chapterName"
             align="center"
+            width="200px"
             label="章节名称">
           </el-table-column>
           <el-table-column

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

@@ -91,11 +91,12 @@
             align="center"
             label="章条编号"
             sortable
-            width="170px">
+            width="101px">
           </el-table-column>
           <el-table-column
             prop="chapterName"
             align="center"
+            width="200px"
             label="章节名称">
           </el-table-column>
           <el-table-column

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

@@ -91,11 +91,12 @@
             sortable
             align="center"
             label="章条编号"
-            width="170px">
+            width="101px">
           </el-table-column>
           <el-table-column
             prop="chapterName"
             align="center"
+            width="200px"
             label="章节名称">
           </el-table-column>
           <el-table-column

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

@@ -91,11 +91,12 @@
             align="center"
             sortable
             label="章条编号"
-            width="170px">
+            width="101px">
           </el-table-column>
           <el-table-column
             prop="chapterName"
             align="center"
+            width="200px"
             label="章节名称">
           </el-table-column>
           <el-table-column

src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue

@@ -197,7 +197,7 @@
               <el-table-column
                 prop="noCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -209,7 +209,7 @@
               <el-table-column
                 prop="completionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
@@ -233,7 +233,7 @@
               <el-table-column
                 prop="zcNoCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -245,7 +245,7 @@
               <el-table-column
                 prop="zcCompletionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>

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

@@ -204,7 +204,7 @@
               <el-table-column
                 prop="researchNonCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
                 <template slot-scope="scope">
                   <el-input
@@ -230,7 +230,7 @@
               <el-table-column
                 prop="researchCompletionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <el-date-picker
@@ -265,7 +265,7 @@
               <el-table-column
                 prop="productionNonCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
                 <template slot-scope="scope">
                   <el-input
@@ -291,7 +291,7 @@
               <el-table-column
                 prop="productionCompletionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <el-date-picker

src/pages/processCenter/pages/creatProcess/xmpg/step5.vue

@@ -197,7 +197,7 @@
               <el-table-column
                 prop="noCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -209,7 +209,7 @@
               <el-table-column
                 prop="completionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
@@ -233,7 +233,7 @@
               <el-table-column
                 prop="zcNoCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -245,7 +245,7 @@
               <el-table-column
                 prop="zcCompletionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>

src/pages/processCenter/pages/creatProcess/xmpg/step6.vue

@@ -197,7 +197,7 @@
               <el-table-column
                 prop="noCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -209,7 +209,7 @@
               <el-table-column
                 prop="completionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
@@ -233,7 +233,7 @@
               <el-table-column
                 prop="zcNoCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -245,7 +245,7 @@
               <el-table-column
                 prop="zcCompletionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>

src/pages/processCenter/pages/creatProcess/xmpg/step7.vue

@@ -197,7 +197,7 @@
               <el-table-column
                 prop="noCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -209,7 +209,7 @@
               <el-table-column
                 prop="completionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
@@ -233,7 +233,7 @@
               <el-table-column
                 prop="zcNoCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -245,7 +245,7 @@
               <el-table-column
                 prop="zcCompletionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>

src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue

@@ -127,7 +127,7 @@
               <el-table-column
                 prop="noCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -139,7 +139,7 @@
               <el-table-column
                 prop="completionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
@@ -163,7 +163,7 @@
               <el-table-column
                 prop="zcNoCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -175,7 +175,7 @@
               <el-table-column
                 prop="zcCompletionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>

src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue

@@ -130,7 +130,7 @@
               <el-table-column
                 prop="noCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -142,7 +142,7 @@
               <el-table-column
                 prop="completionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
@@ -167,7 +167,7 @@
               <el-table-column
                 prop="zcNoCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -179,7 +179,7 @@
               <el-table-column
                 prop="zcCompletionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""

src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue

@@ -130,7 +130,7 @@
               <el-table-column
                 prop="noCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -142,7 +142,7 @@
               <el-table-column
                 prop="completionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
@@ -167,7 +167,7 @@
               <el-table-column
                 prop="zcNoCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -179,7 +179,7 @@
               <el-table-column
                 prop="zcCompletionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""

src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue

@@ -130,7 +130,7 @@
               <el-table-column
                 prop="noCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -142,7 +142,7 @@
               <el-table-column
                 prop="completionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
@@ -167,7 +167,7 @@
               <el-table-column
                 prop="zcNoCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -179,7 +179,7 @@
               <el-table-column
                 prop="zcCompletionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""

src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue

@@ -49,11 +49,12 @@
           </div>
         </div>
         <el-table
-          :data="dataList"
-          style="width: 100%; border: 1px solid #cccccc"
+          :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
+          style="width: 100%; border: 1px solid #cccccc;height: 400px"
           row-key="standId"
           height="70%"
           border
+          highlight-current-row
           @selection-change="selectStandChange"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
           fontWeight: 'bold'}"
@@ -72,7 +73,8 @@
           >
             <template slot-scope="scope">
               <a v-if="scope.row.standYear" class="table-jump"
-                 @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber
+                 @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{
+                  scope.row.standNumber
                 }}-{{ scope.row.standYear }}</a>
               <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }}
                 {{ scope.row.standNumber }}</a>
@@ -144,7 +146,7 @@
               <el-table-column
                 prop="researchNonCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
                 <template slot-scope="scope">
                   <el-input
@@ -170,7 +172,7 @@
               <el-table-column
                 prop="researchCompletionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <el-date-picker
@@ -205,7 +207,7 @@
               <el-table-column
                 prop="productionNonCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
                 <template slot-scope="scope">
                   <el-input
@@ -231,7 +233,7 @@
               <el-table-column
                 prop="productionCompletionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <el-date-picker
@@ -243,18 +245,26 @@
               </el-table-column>
             </el-table-column>
           </el-table-column>
-<!--          以后全选可能用-->
-<!--          <el-table-column-->
-<!--              prop="productionCompletionTime"-->
-<!--              align="center"-->
-<!--              fixed="right"-->
-<!--              width="160"-->
-<!--              label="操作">-->
-<!--            <template slot-scope="scope">-->
-<!--              <el-button style="width: 98%" size="small" type="primary" @click="">{{ "批量编辑" }}</el-button>-->
-<!--            </template>-->
-<!--          </el-table-column>-->
+          <!--          以后全选可能用-->
+          <!--          <el-table-column-->
+          <!--              prop="productionCompletionTime"-->
+          <!--              align="center"-->
+          <!--              fixed="right"-->
+          <!--              width="160"-->
+          <!--              label="操作">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              <el-button style="width: 98%" size="small" type="primary" @click="">{{ "批量编辑" }}</el-button>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
         </el-table>
+        <el-pagination
+          layout="total,sizes, prev, pager, next"
+          background
+          :page-sizes="[20, 40, 60]"
+          :total="total"
+          @current-change="handleCurrentChange"
+        >
+        </el-pagination>
       </div>
       <div>
         <el-collapse accordion>
@@ -353,77 +363,80 @@
     </ProcessFooter>
     <!-- 福田全公司选人解决方案 -->
     <Role-tree
-        check-box
-        :is-title="drawerTitle"
-        :is-visible.sync="drawerModal"
-        @checkedRole="checkedTransferRole"
-        :nodeList="nodeList"
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="drawerModal"
+      @checkedRole="checkedTransferRole"
+      :nodeList="nodeList"
     ></Role-tree>
     <el-drawer
-        title="批量填写"
-        :visible.sync="modalshowflag"
-        :wrapperClosable="false"
-        size="800px">
+      title="批量填写"
+      :visible.sync="modalshowflag"
+      :wrapperClosable="false"
+      size="800px">
       <div class="demo-drawer-content">
         <el-form :model="batchEditForm" class="label-input-form" ref="projectComplianceForm" label-width="150">
           <el-divider><span><b>在研产品</b></span></el-divider>
-          <el-formItem label="合规原因" class="add-form-item" >
+          <el-formItem label="合规原因" class="add-form-item">
             <el-input
-                v-model="batchEditForm.complianceReasons"
-                placeholder="请输入合规原因"
+              v-model="batchEditForm.complianceReasons"
+              placeholder="请输入合规原因"
             ></el-input>
           </el-formItem>
-          <el-form-item label="不合规项目" class="add-form-item" >
+          <el-form-item label="不合规项目" class="add-form-item">
             <el-input
-                v-model="batchEditForm.noCompliance"
-                placeholder="请输入不合规项目"
+              v-model="batchEditForm.noCompliance"
+              placeholder="请输入不合规项目"
             ></el-input>
           </el-form-item>
-          <el-form-item label="不合规应对措施" class="add-form-item" >
+          <el-form-item label="不合规应对措施" class="add-form-item">
             <el-input
-                v-model="batchEditForm.countermeasures"
-                placeholder="请输入不合规应对措施"
+              v-model="batchEditForm.countermeasures"
+              placeholder="请输入不合规应对措施"
             ></el-input>
           </el-form-item>
-          <el-form-item label="完成时间" class="add-form-item" >
+          <el-form-item label="完成时间" class="add-form-item">
             <el-date-picker
-                v-model="batchEditForm.completionTime"
-                type="date"
-                placeholder="选择日期">
+              v-model="batchEditForm.completionTime"
+              type="date"
+              placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
           <br>
           <el-divider><span><b>在产产品</b></span></el-divider>
-          <el-formItem label="合规原因" class="add-form-item" >
+          <el-formItem label="合规原因" class="add-form-item">
             <el-input
-                v-model="batchEditForm.zcComplianceReasons"
-                placeholder="请输入合规原因"
+              v-model="batchEditForm.zcComplianceReasons"
+              placeholder="请输入合规原因"
             ></el-input>
           </el-formItem>
-          <el-form-item label="不合规项目" class="add-form-item" >
+          <el-form-item label="不合规项目" class="add-form-item">
             <el-input
-                v-model="batchEditForm.zcNoCompliance"
-                placeholder="请输入不合规项目"
+              v-model="batchEditForm.zcNoCompliance"
+              placeholder="请输入不合规项目"
             ></el-input>
           </el-form-item>
-          <el-form-item label="不合规应对措施" class="add-form-item" >
+          <el-form-item label="不合规应对措施" class="add-form-item">
             <el-input
-                v-model="batchEditForm.zcCountermeasures"
-                placeholder="请输入不合规应对措施"
+              v-model="batchEditForm.zcCountermeasures"
+              placeholder="请输入不合规应对措施"
             ></el-input>
           </el-form-item>
-          <el-form-item label="完成时间" class="add-form-item" >
+          <el-form-item label="完成时间" class="add-form-item">
             <el-date-picker
-                v-model="batchEditForm.zcCompletionTime"
-                type="date"
-                placeholder="选择日期">
+              v-model="batchEditForm.zcCompletionTime"
+              type="date"
+              placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
         </el-form>
       </div>
       <div class="demo-drawer-footer">
-        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveBatchEditForm">确定</el-button>
-        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelBatchEditForm">取消</el-button>
+        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveBatchEditForm">
+          确定
+        </el-button>
+        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelBatchEditForm">取消
+        </el-button>
       </div>
     </el-drawer>
   </div>
@@ -433,7 +446,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, saveTaskForPub ,changeAssigneeNew } from "api/process";
+import {inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew} from "api/process";
 
 export default {
   name: "xmpg2Step6",
@@ -444,30 +457,33 @@ export default {
   },
   data() {
     return {
-      nodeList:[],
+      total: 0,
+      currentPage: 1,
+      pageSize: 20,
+      nodeList: [],
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,
       batchEditForm: {
         // 在研产品
         // 合规
-        complianceReasons :'',
+        complianceReasons: '',
         // 不合规
-        noCompliance :'',
+        noCompliance: '',
         // 应对措施
-        countermeasures :'',
+        countermeasures: '',
         // 完成时间
-        completionTime :'',
+        completionTime: '',
 
         // 在产产品
         // 合规
-        zcComplianceReasons :'',
+        zcComplianceReasons: '',
         // 不合规
-        zcNoCompliance:'',
+        zcNoCompliance: '',
         // 应对措施
-        zcCountermeasures:'',
+        zcCountermeasures: '',
         // 完成时间
-        zcCompletionTime:''
+        zcCompletionTime: ''
       },
       hasChildren: true,
       active: "1",
@@ -519,7 +535,7 @@ export default {
   },
   methods: {
     //确认转办
-    checkedTransferRole (data) {
+    checkedTransferRole(data) {
       this.assigneeNewLoading = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
@@ -539,7 +555,7 @@ export default {
       })
     },
     // 请求转换流程图
-    processNum (row) {
+    processNum(row) {
       axios.request({
         url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
         responseType: 'blob',
@@ -554,7 +570,7 @@ export default {
       })
     },
     //转办事件
-    handleTransfer(){
+    handleTransfer() {
       this.drawerModal = true
       this.drawerTitle = '转办处理人'
       this.selectPeople = row
@@ -563,8 +579,8 @@ export default {
     saveBatchEditForm() {
 
       // console.log(this.selectList)
-      for( let a = 0; a < this.dataList.length; a++) {
-        for ( let b = 0; b < this.selectList.length; b++) {
+      for (let a = 0; a < this.dataList.length; a++) {
+        for (let b = 0; b < this.selectList.length; b++) {
           if (this.dataList[a].id === this.selectList[b]) {
             //合规
             this.dataList[a].complianceReasons = this.batchEditForm.complianceReasons
@@ -582,9 +598,9 @@ export default {
             this.dataList[a].zcCountermeasures = this.batchEditForm.zcCountermeasures
             //完成时间
             this.dataList[a].zcCompletionTime = this.batchEditForm.zcCompletionTime
-          }else {
-            for (let i=0;i<this.dataList[a].children.length;i++){
-              if (this.dataList[a].children[i].id === this.selectList[b]){
+          } else {
+            for (let i = 0; i < this.dataList[a].children.length; i++) {
+              if (this.dataList[a].children[i].id === this.selectList[b]) {
                 //合规
                 this.dataList[a].children[i].complianceReasons = this.batchEditForm.complianceReasons
                 //不合规
@@ -696,7 +712,6 @@ export default {
           pId: this.pId
         }).then(res => {
           if (res) {
-            console.log(res.mesg);
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);
           }
@@ -713,15 +728,27 @@ export default {
           this.listForm.prcName = this.prcName;
           this.listForm["id"] = item.id;
           // this.listForm.dataList = item.dataList;
-          this.dataList = this.listForm.dataList;
-          console.log(this.dataList);
+          this.dataList = this.listForm.dataList[0].children
+          this.dataList.map(item => {
+            this.$set(item, 'standName', this.listForm.dataList[0].standName)
+            this.$set(item, 'standEnName', this.listForm.dataList[0].standEnName)
+            this.$set(item, 'standYear', this.listForm.dataList[0].standYear)
+            this.$set(item, 'standSort', this.listForm.dataList[0].standSort)
+            this.$set(item, 'standNumber', this.listForm.dataList[0].standNumber)
+          })
+          this.total = this.listForm.dataList[0].children.length;
         } else {
           this.listForm = item.form;
-          this.dataList = item.form.dataList;
+          this.dataList = item.form.dataList[0].children
+          this.total = item.form.dataList[0].children.length;
         }
 
       });
     },
+    // 分页
+    handleCurrentChange(currentPage) {
+      this.currentPage = currentPage;
+    },
     //保存事件
     handleSave() {
       this.saveLoading = true;
@@ -874,10 +901,12 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
-  /deep/.el-table th > .cell{
+
+  /deep/ .el-table th > .cell {
     font-size: 12px;
   }
-  /deep/.el-table thead.is-group th{
+
+  /deep/ .el-table thead.is-group th {
     padding: 0px;
   }
 }

src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue

@@ -130,7 +130,7 @@
               <el-table-column
                 prop="noCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -142,7 +142,7 @@
               <el-table-column
                 prop="completionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
@@ -167,7 +167,7 @@
               <el-table-column
                 prop="zcNoCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -179,7 +179,7 @@
               <el-table-column
                 prop="zcCompletionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""

src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue

@@ -130,7 +130,7 @@
               <el-table-column
                       prop="noCompliance"
                       align="center"
-                      width="160"
+                      width="170"
                       label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -142,7 +142,7 @@
               <el-table-column
                       prop="completionTime"
                       align="center"
-                      width="160"
+                      width="120"
                       label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
@@ -166,7 +166,7 @@
               <el-table-column
                       prop="zcNoCompliance"
                       align="center"
-                      width="160"
+                      width="170"
                       label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -178,7 +178,7 @@
               <el-table-column
                       prop="zcCompletionTime"
                       align="center"
-                      width="160"
+                      width="120"
                       label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>

src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue

@@ -130,7 +130,7 @@
               <el-table-column
                 prop="noCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -142,7 +142,7 @@
               <el-table-column
                 prop="completionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
@@ -167,7 +167,7 @@
               <el-table-column
                 prop="zcNoCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -179,7 +179,7 @@
               <el-table-column
                 prop="zcCompletionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -3192,7 +3192,10 @@ export default {
 
         }
       }
-      this.getDomesticStandardTable(this.tableFlag)
+      // this.getDomesticStandardTable(this.tableFlag)
+      //搜索后排序,应该以被搜索后的数据排序
+      this.getDomesticStandardTable(this.standCommonlySearch)
+
     },
     // 修改成表格样式后，选择项勾选改变
     standSelectChange(data) {