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

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

@@ -55,14 +55,14 @@
                     ></el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item label="标准年份" v-show="form.standInData === '0'" prop="standYear" class="add-form-item form-item-disabled">
+                <el-form-item label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
                   <el-input
                           v-model="form.standYear"
                           placeholder="请输入标准标准年份"
                           clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="标准中文名称"v-show="form.standInData === '0'"  prop="standName" class="add-form-item form-item-disabled">
+                <el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
                   <el-input
                       v-model="form.standName"
                       placeholder="请输入标准中文名称"
@@ -125,6 +125,7 @@
                     <el-radio label="1">是</el-radio>
                     <el-radio label="2">否</el-radio>
                   </el-radio-group>
+                  <el-button @click="form.isRelateAccess = ''" v-show="form.isRelateAccess !== null>0" size="mini" type="primary" circle icon="el-icon-close" style="margin-left: 10px;margin-bottom: 3px"></el-button>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
                   <el-input v-model="form.standSystem" placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>

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

@@ -162,15 +162,15 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="工程研究总院院长/FU/BU/SBU领导审批" placement="top"
+            <el-timeline-item timestamp="工程研究总院院长" placement="top"
                               :color="roleForm.directorUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="presidentName" style="margin-bottom: 0">
-                  <h4>工程研究总院院长/FU/BU/SBU领导</h4>
+                  <h4>工程研究总院院长</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.president" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.presidentName" placeholder="选择工程研究总院院长/FU/BU/SBU领导"
+                    <el-input v-model="roleForm.presidentName" placeholder="选择工程研究总院院长"
-                              @click.native="choiceZRR('president', '工程研究总院院长/FU/BU/SBU领导', roleForm.president)"></el-input>
+                              @click.native="choiceZRR('president', '工程研究总院院长', roleForm.president)"></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -420,7 +420,7 @@ export default {
           {required: true, message: "请选择技术管理中心主任", trigger: "change"}
         ],
         presidentName: [
-          {required: true, message: "请选择工程研究总院院长/FU/BU/SBU领导", trigger: "change"}
+          {required: true, message: "请选择工程研究总院院长", trigger: "change"}
         ]
       },
     }

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -1437,25 +1437,26 @@
 </template>
 
 <script>
-import CustomInput from '@/components/CustomFormComponents/Input'
+import CustomInput from "@/components/CustomFormComponents/Input";
-import CustomTextarea from '@/components/CustomFormComponents/Textarea'
+import CustomTextarea from "@/components/CustomFormComponents/Textarea";
-import CustomSearchSelect from '@/components/CustomFormComponents/SearchSelect'
+import CustomSearchSelect from "@/components/CustomFormComponents/SearchSelect";
-import CustomSelect from '@/components/CustomFormComponents/Select'
+import CustomSelect from "@/components/CustomFormComponents/Select";
-import CustomDatePick from '@/components/CustomFormComponents/DatePicker'
+import CustomDatePick from "@/components/CustomFormComponents/DatePicker";
-import CustomFile from '@/components/CustomFormComponents/File'
+import CustomFile from "@/components/CustomFormComponents/File";
-import CustomInputForStandards from '@/components/CustomFormComponents/InputForStandardsForEnterprise'
+import CustomInputForStandards from "@/components/CustomFormComponents/InputForStandardsForEnterprise";
-import customSelectArray from '@/components/CustomFormComponents/SelectArray'
+import customSelectArray from "@/components/CustomFormComponents/SelectArray";
-import CustomOrg from '@/components/CustomFormComponents/OrgTree'
+import CustomOrg from "@/components/CustomFormComponents/OrgTree";
-import CustomSVPPS from '@/components/CustomFormComponents/SVPPS'
+import CustomSVPPS from "@/components/CustomFormComponents/SVPPS";
-import TreeSelect from '@/components/treeSelect/treeSelect.vue';
+import TreeSelect from "@/components/treeSelect/treeSelect.vue";
-import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
+import TreeSelectNew from "@/components/treeSelect/treeSelectNew.vue";
-import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle'
+import ProcessTitle from "@/pages/processCenter/pages/components/ProcessTitle";
 import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
 
-import {mapGetters} from 'vuex'
+import { mapGetters } from "vuex";
 import store from "@/store";
+
 export default {
-  name: 'EnterpriseStandardDatabase',
+  name: "EnterpriseStandardDatabase",
   components: {
     CustomFile,
     CustomInput,
@@ -3916,17 +3917,26 @@ export default {
                 formFieldList.forEach((item) => {
                     const value = this.sarBussionessSearch[item.attrField]
                     // 时间格式处理
-                    if (value !== undefined && value !== null && value !== '') {
+                  if (value !== undefined && value !== null && value !== "") {
-                        advanceSearchVOList.push({
+                    advanceSearchVOList.push({
-                            connect: advanceSearchVOList.length > 0 ? "and" : "",
+                      connect: advanceSearchVOList.length > 0 ? "and" : "",
-                            field: item.attrField || '',
+                      field: item.attrField || "",
-                            type: 'like',
+                      type: "between",
-                            value: value
+                      value: value.join(',')
-                        })
+                    });
-                    }
+                  }
                 })
             }
-            formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
+          formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
+          this.SarExportSearchEo = formData;
+          formData.startIssueTime = formData.issueTime ? formData.issueTime[0] : null;
+          formData.endIssueTime = formData.issueTime ? formData.issueTime[1] : null;
+          formData.startPutTime = formData.putTime ? formData.putTime[0] : null;
+          formData.endPutTime = formData.putTime ? formData.putTime[1] : null;
+          formData.FSRQBUSS = null;
+          formData.FZRQBUSS = null;
+          formData.putTime = null;
+          formData.issueTime = null;
         }
         this.SarExportSearchEo = formData
       this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', formData, {