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

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

@@ -150,7 +150,7 @@
                         show-overflow-tooltip
                         align="center">
                     <template slot-scope="scope">
-                        {{ scope.row.applyArctic.toString() }}
+                        {{ JSON.parse(scope.row.applyArctic).join(',') }}
                     </template>
                 </el-table-column>
                 <el-table-column

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

@@ -151,7 +151,7 @@
                         show-overflow-tooltip
                         align="center">
                     <template slot-scope="scope">
-                        {{ scope.row.applyArctic.toString() }}
+                        {{ JSON.parse(scope.row.applyArctic).join(',') }}
                     </template>
                 </el-table-column>
                 <el-table-column

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

@@ -145,7 +145,7 @@
                         show-overflow-tooltip
                         align="center">
                     <template slot-scope="scope">
-                        {{ scope.row.applyArctic.toString() }}
+                        {{ JSON.parse(scope.row.applyArctic).join(',') }}
                     </template>
                 </el-table-column>
                 <el-table-column

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

@@ -145,7 +145,7 @@
                         show-overflow-tooltip
                         align="center">
                     <template slot-scope="scope">
-                        {{ scope.row.applyArctic.toString() }}
+                        {{ JSON.parse(scope.row.applyArctic).join(',') }}
                     </template>
                 </el-table-column>
                 <el-table-column

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

@@ -145,7 +145,7 @@
                         show-overflow-tooltip
                         align="center">
                     <template slot-scope="scope">
-                        {{ scope.row.applyArctic.toString() }}
+                        {{ JSON.parse(scope.row.applyArctic).join(',') }}
                     </template>
                 </el-table-column>
                 <el-table-column

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

@@ -43,6 +43,16 @@
                     placeholder="请选择结束日期">
                   </el-date-picker>
                 </el-form-item>
+                <el-form-item label="文本状态" prop="textType" class="add-form-item form-item-disabled">
+                  <el-select :disabled="!form.cid" v-model="form.textType" placeholder="请选择">
+                    <el-option
+                            v-for="(item, index) in textTypeList"
+                            :key="index"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
                 <el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
                   <div class="addButton" style="padding-left: 10px">
                     <el-button size="small" type="primary" :disabled="!form.cid" @click="addfjList">选择附件</el-button>
@@ -51,7 +61,7 @@
                           v-model="form.fjListId"
                           style="display: none;"
                   ></el-input>
-                  <div style="display: flex;">
+                  <div style="">
                     <div class="fileClass" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
                       <span @click="fileLook(item)" >{{ item.fileName }}</span>
                       <el-button
@@ -366,6 +376,7 @@ export default {
   name: "bzzqyjStep1-1",
   data() {
     return {
+      textTypeList: [],
       pickerOptions: {
         disabledDate(time) {
           return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
@@ -397,7 +408,6 @@ export default {
         standId: '',
         fjList: [],
         fjListId: '',
-        fjListId: '',
         textType: '',
         modelList: [],
         modelNameList: ''
@@ -411,6 +421,9 @@ export default {
         ],
         fjListId: [
           {required: true, message: '请选择附件', trigger: 'change'},
+        ],
+        textType: [
+          {required: true, message: '请选择文本状态', trigger: 'change'},
         ]
       },
       // 标准征求意见数据可库
@@ -418,6 +431,7 @@ export default {
         standSort: '',
         standNumber: '',
         standType: '',
+        standId: '',
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent
       },
@@ -598,19 +612,9 @@ export default {
           }
         }
       })
-      // this.$http.get('lawss/sarStandFile/queryFileInfo', {
-      //   standId: this.form.standId
-      // }, {}, res => {
-      //   this.fjList = res.data
-      //   this.fzlistModel = true
-      // })
     },
     handleSelection2(data) {
-      if (data.length > 1) {
+      this.addFjList = data
-        this.$message.warning('最多选择1条附件')
-      } else {
-        this.addFjList = data
-      }
     },
     closeDrawer2() {
       this.fzlistModel = false
@@ -619,16 +623,18 @@ export default {
     enterDrawer2() {
       this.fzlistModel = false
       this.form.fjList = this.addFjList
-      this.form.textType =  this.setWBType(this.addFjList[0].standFileClassify)
-      this.form.textValue = this.addFjList[0].standFileClassify
       let idList = []
       let nameList = []
       this.addFjList.forEach(item => {
-        idList.push(item.id)
+        if (nameList.length > 0) {
-        nameList.push(item.fileName)
+          nameList += ','
+          idList += ','
+        }
+        idList += item.id
+        nameList += item.fileName
       })
-      this.form.fjListName = nameList.join(',')
+      this.form.fjListName = nameList
-      this.form.fjListId = idList.join(',')
+      this.form.fjListId = idList
     },
     // 点击查看
     handlePreview(item) {
@@ -681,7 +687,7 @@ export default {
     sarStandCompareHis() {
       this.spinShow = true
       var formData = this.standCommonlySearch
-      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
+      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1', formData, {
         _this: this
       }, res => {
         this.standInfoList = res.data.list
@@ -725,7 +731,14 @@ export default {
         } else {
           this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber + ' ' + bringData[0].standName
         }
+        this.form.standType = bringData[0].standType
+        this.form.standId = bringData[0].id
         this.listModel = false;
+        this.$http.get('SarStandItems/sar-stand-items/getFileType', {
+          standId: bringData[0].id
+        }, {}, res => {
+          this.textTypeList = res.data
+        })
       } else if (this.selectedList.length > 1) {
         this.$message.warning("只能选择一条数据进行带入");
       } else {
@@ -747,7 +760,7 @@ export default {
       })
       if (this.type2 === '1') {
         this.roleForm.dockUserList = idList
-        this.roleForm.dockUserName = nameList
+        this.roleForm.dockUserListName = nameList
       } else {
         this.roleForm.directorUser = idList
         this.roleForm.directorUserName = nameList

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

@@ -53,7 +53,7 @@
                           v-model="form.fjListId"
                           style="display: none;"
                   ></el-input>
-                  <div style="display: flex;">
+                  <div>
                     <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
                   </div>
                 </el-form-item>

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

@@ -43,6 +43,16 @@
                     placeholder="请选择结束日期">
                   </el-date-picker>
                 </el-form-item>
+                <el-form-item label="文本状态" prop="textType" class="add-form-item form-item-disabled">
+                  <el-select :disabled="!form.cid" v-model="form.textType" placeholder="请选择">
+                    <el-option
+                            v-for="(item, index) in textTypeList"
+                            :key="index"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
                 <el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
                   <div class="addButton" style="padding-left: 10px">
                     <el-button size="small" type="primary" :disabled="!form.cid" @click="addfjList">选择附件</el-button>
@@ -51,7 +61,7 @@
                     v-model="form.fjListId"
                     style="display: none;"
                   ></el-input>
-                  <div style="display: flex;">
+                  <div style="">
                     <div class="fileClass" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
                       <span @click="fileLook(item)" >{{ item.fileName }}</span>
                       <el-button
@@ -374,6 +384,7 @@ export default {
   name: "bzzqyjStep1",
   data() {
     return {
+      textTypeList: [],
       drawerTitle2: '',
       type2: '',
       pickerOptions: {
@@ -407,7 +418,6 @@ export default {
         fjList: [],
         fjListName: '',
         fjListId: '',
-        textValue: '',
         textType: '',
         modelList: [],
         modelNameList: ''
@@ -421,6 +431,9 @@ export default {
         ],
         fjListId: [
           {required: true, message: '请选择附件', trigger: 'change'},
+        ],
+        textType: [
+          {required: true, message: '请选择文本状态', trigger: 'change'},
         ]
       },
       // 标准征求意见数据可库
@@ -608,19 +621,9 @@ export default {
           }
         }
       })
-      // this.$http.get('lawss/sarStandFile/queryFileInfo', {
-      //   standId: this.form.standId
-      // }, {}, res => {
-      //   this.fjList = res.data
-      //   this.fzlistModel = true
-      // })
     },
     handleSelection2(data) {
-      if (data.length > 1) {
+      this.addFjList = data
-        this.$message.warning('最多选择1条附件')
-      } else {
-        this.addFjList = data
-      }
     },
     closeDrawer2() {
       this.fzlistModel = false
@@ -629,16 +632,18 @@ export default {
     enterDrawer2() {
       this.fzlistModel = false
       this.form.fjList = this.addFjList
-      this.form.textType =  this.setWBType(this.addFjList[0].standFileClassify)
-      this.form.textValue = this.addFjList[0].standFileClassify
       let idList = []
       let nameList = []
       this.addFjList.forEach(item => {
-        idList.push(item.id)
+        if (nameList.length > 0) {
-        nameList.push(item.fileName)
+          nameList += ','
+          idList += ','
+        }
+        idList += item.id
+        nameList += item.fileName
       })
-      this.form.fjListName = nameList.join(',')
+      this.form.fjListName = nameList
-      this.form.fjListId = idList.join(',')
+      this.form.fjListId = idList
     },
     // 点击查看
     handlePreview(item) {
@@ -729,9 +734,8 @@ export default {
         this.listModel = false;
         this.$http.get('SarStandItems/sar-stand-items/getFileType', {
           standId: bringData[0].id
-        }, res => {
+        }, {}, res => {
-          console.log(data);
+          this.textTypeList = res.data
-          console.log(res.data);
         })
       } else if (this.selectedList.length > 1) {
         this.$message.warning("只能选择一条数据进行带入");

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

@@ -45,7 +45,7 @@
                           v-model="form.fjListId"
                           style="display: none;"
                   ></el-input>
-                  <div style="display: flex;">
+                  <div style="">
                     <div class="fileClass"
                          style="margin-right: 15px;padding-left: 10px"
                          v-for="(item, index) in form.fjList"

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

@@ -45,7 +45,7 @@
                                             v-model="form.fjListId"
                                             style="display: none;"
                                     ></el-input>
-                                    <div style="display: flex;">
+                                    <div>
                                         <div class="fileClass"
                                              style="margin-right: 15px;padding-left: 10px"
                                              v-for="(item, index) in form.fjList"
@@ -659,6 +659,7 @@
                 }, {}, res => {
                     if (res.ok) {
                         this.options = res.data.list
+                        console.log(res);
                     }
                 }, e => {
                 })
@@ -691,7 +692,7 @@
                         this.form.endTime = data.endTime || data.form.endTime
                         this.todoId = res.id
                         this.json = data
-                        this.getItemList(data.standId,this.form.textValue)
+                        this.getItemList(data.standId,data.textType)
                         this.data = data.info || data.data || data.form.data || []
                     }).catch(e => {
                     })

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

@@ -45,7 +45,7 @@
                                             v-model="form.fjListId"
                                             style="display: none;"
                                     ></el-input>
-                                    <div style="display: flex;">
+                                    <div>
                                         <div class="fileClass"
                                              style="margin-right: 15px;padding-left: 10px"
                                              v-for="(item, index) in form.fjList"

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

@@ -45,7 +45,7 @@
                                             v-model="form.fjListId"
                                             style="display: none;"
                                     ></el-input>
-                                    <div style="display: flex;">
+                                    <div>
                                         <div class="fileClass"
                                              style="margin-right: 15px;padding-left: 10px"
                                              v-for="(item, index) in form.fjList"

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

@@ -45,7 +45,7 @@
                           v-model="form.fjListId"
                           style="display: none;"
                   ></el-input>
-                  <div style="display: flex;">
+                  <div>
                     <div class="fileClass"
                          style="margin-right: 15px;padding-left: 10px"
                          v-for="(item, index) in form.fjList"
@@ -664,7 +664,7 @@ export default {
           this.form.spId = data.spId || ''
           this.form.spName = data.spName || ''
           this.json = data
-          this.getItemList(data.standId,this.form.textValue)
+          this.getItemList(data.standId,data.textType)
           this.data = data.info || data.data
         }).catch(e => {
         })

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

@@ -45,7 +45,7 @@
                           v-model="form.fjListId"
                           style="display: none;"
                   ></el-input>
-                  <div style="display: flex;">
+                  <div>
                     <div class="fileClass"
                          style="margin-right: 15px;padding-left: 10px"
                          v-for="(item, index) in form.fjList"

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

@@ -45,7 +45,7 @@
                           v-model="form.fjListId"
                           style="display: none;"
                   ></el-input>
-                  <div style="display: flex;">
+                  <div>
                     <div class="fileClass"
                          style="margin-right: 15px;padding-left: 10px"
                          v-for="(item, index) in form.fjList"

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

@@ -45,7 +45,7 @@
                           v-model="form.fjListId"
                           style="display: none;"
                   ></el-input>
-                  <div style="display: flex;">
+                  <div>
                     <div class="fileClass"
                          style="margin-right: 15px;padding-left: 10px"
                          v-for="(item, index) in form.fjList"

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

@@ -45,7 +45,7 @@
                           v-model="form.fjListId"
                           style="display: none;"
                   ></el-input>
-                  <div style="display: flex;">
+                  <div>
                     <div class="fileClass"
                          style="margin-right: 15px;padding-left: 10px"
                          v-for="(item, index) in form.fjList"

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

@@ -45,7 +45,7 @@
                           v-model="form.fjListId"
                           style="display: none;"
                   ></el-input>
-                  <div style="display: flex;">
+                  <div>
                     <div class="fileClass"
                          style="margin-right: 15px;padding-left: 10px"
                          v-for="(item, index) in form.fjList"

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue

@@ -268,7 +268,7 @@
     <el-drawer
       title="选择体系结构"
       :visible.sync="TXJGmodal"
-      size="900px"
+      size="400px"
       custom-class="demo-drawer"
     >
       <div class="standardForComments">
@@ -344,7 +344,7 @@ export default {
       standSystemOptions: [],
       QYBZform: {
         page: 1,
-        pageSzie: this.$store.getters.userInfo.configContent,
+        pageSize: this.$store.getters.userInfo.configContent,
         validFlag: '0',
         userId: this.$store.getters.userInfo.userId,
         standCode: '',

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue

@@ -436,7 +436,7 @@
     <el-drawer
       title="选择体系结构"
       :visible.sync="TXJGmodal"
-      size="900px"
+      size="400px"
       custom-class="demo-drawer"
     >
       <div class="standardForComments">
@@ -514,7 +514,7 @@ export default {
       standSystemOptions: [],
       QYBZform: {
         page: 1,
-        pageSzie: this.$store.getters.userInfo.configContent,
+        pageSize: this.$store.getters.userInfo.configContent,
         validFlag: '0',
         userId: this.$store.getters.userInfo.userId,
         standCode: '',

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -4289,7 +4289,7 @@ export default {
     },
     // 分页查询国内标准
     getDomesticStandardTable(item) {
-      console.log(item)
+      console.log('4292',item)
       if (item !== '' && item !== null && item !== undefined) {
         item.pageSize = this.$store.getters.userInfo.configContent
       }
@@ -4330,9 +4330,26 @@ export default {
       // // 自定义属性字段高级搜索处理
       //advanceSearchVOStr
       const advanceSearchVOList = [];
+      console.log('4333',this.advanceSearchMapping)
       for (let key in this.advanceSearchMapping) {
+        console.log('key',key)
         const value = this.advanceSearchMapping[key];
-        if (value !== null && value !== '') {
+        console.log('value',value)
+        if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (item.CLLX&&item.CLLX.length>0)) ){
+          advanceSearchVOList.push({
+            connect: "and",
+            field: key || '',
+            type: 'regexp',
+            value: value.join(',')
+          });
+        }else if (value !== null && value !== '' && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ' )){
+          advanceSearchVOList.push({
+            connect: "and",
+            field: key || '',
+            type: 'between',
+            value: value.join(',')
+          });
+        }else if (value !== null && value !== ''){
           advanceSearchVOList.push({
             connect: "and",
             field: key || '',

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -3810,9 +3810,26 @@ export default {
       // // 自定义属性字段高级搜索处理
       //advanceSearchVOStr
       const advanceSearchVOList = [];
+      console.log('4333',this.advanceSearchMapping)
       for (let key in this.advanceSearchMapping) {
+        console.log('key',key)
         const value = this.advanceSearchMapping[key];
-        if (value !== null && value !== '') {
+        console.log('value',value)
+        if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (item.CLLX&&item.CLLX.length>0)) ){
+          advanceSearchVOList.push({
+            connect: "and",
+            field: key || '',
+            type: 'regexp',
+            value: value.join(',')
+          });
+        }else if (value !== null && value !== '' && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ' )){
+          advanceSearchVOList.push({
+            connect: "and",
+            field: key || '',
+            type: 'between',
+            value: value.join(',')
+          });
+        }else if (value !== null && value !== ''){
           advanceSearchVOList.push({
             connect: "and",
             field: key || '',