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

src/pages/details/otherStandardDetails/index.vue

@@ -266,9 +266,9 @@
                       <p class="half"><label style=" margin-right: 150px;">发布日期</label><span>{{
                           sarStandardsInfoEO.issueTime || '-'
                         }}</span></p>
-                      <p class="half" v-if="saveStandType === 'INLAND_STAND'"><label style=" margin-right: 150px;">标准性质</label><span>{{
+<!--                      <p class="half" v-if="saveStandType === 'INLAND_STAND'"><label style=" margin-right: 150px;">标准性质</label><span>{{-->
-                          standMap[sarStandardsInfoEO.standNature] || '-'
+<!--                          standMap[sarStandardsInfoEO.standNature] || '-'-->
-                        }}</span></p>
+<!--                        }}</span></p>-->
                       <p class="half" v-if="saveStandType === 'INLAND_STAND'"><label
                         style=" margin-right: 150px;">标准体系</label><span>{{
                           sarStandardsInfoEO.standSystem || '-'
@@ -374,7 +374,7 @@
                     v-else-if="child.attrType === 'DATE_PICKER'"
                     class="modular-content-p-val"
                   >
-                {{ child.value ? child.value.substring(0, 10) : '-' }}
+                {{ child.value ? child.value : '-' }}
               </span>
                   <span
                     v-else-if="child.attrType !== 'FILE'"
@@ -3124,7 +3124,6 @@ export default {
     },
     // 分解单----查看标准条款相关
     selectSarStandItems(id, flag) {
-      this.page7 = 1
       this.standItemSearch.standId = this.sarStandardsInfoEO.id
       this.standItemSearch.fileType = this.fileType
       this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
@@ -3675,6 +3674,7 @@ export default {
         //   return
         // }
         displayLocation.forEach((location) => {
+          console.log(location);
           location.isShowImp = '0'
           if (dynamicFormField) {
             let value = dynamicFormField[field.attrField]

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue

@@ -380,7 +380,7 @@
         name="file"
         drag
         :file-list="rh_pageData.infoSources"
-        accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
+        accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF, .pptx"
         :http-request="httpRequest"
         :before-upload="handleBeforeUpload"
         :before-remove="handleBeforeRemove"
@@ -603,7 +603,7 @@ export default {
       // 判断上传文件格式
       if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip'
         || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF'
-        || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' || fileSuffix === '.PPT'
+        || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' || fileSuffix === '.pptx'
         || fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.bmp') {
         return true
       } else {

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue

@@ -142,7 +142,7 @@
             </el-row>
             <el-row>
               <el-col :span="8">
-                <el-form-item class="add-form-item" label="身份:">
+                <el-form-item class="add-form-item" label="职务/名称:">
                   <el-input
                     style="width: 100%"
                     placeholder="请填写身份"
@@ -181,6 +181,8 @@
                   />
                 </el-form-item>
               </el-col>
+            </el-row>
+            <el-row>
               <el-col :span="8">
                 <el-form-item class="add-form-item" label="资料:">
                   <el-upload

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue

@@ -81,7 +81,7 @@
                     </a>
                     <el-button
                       size="mini"
-                      @click="previews(item.id)"
+                      @click="previews(item.id, 'down')"
                       icon="el-icon-download"
                       style="height: 25px; margin-left: 5px;"
                     ></el-button>
@@ -120,14 +120,20 @@
                 <el-table-column prop="fillPeople" align="center" label="参与人"/>
                 <el-table-column prop="fillUnit" align="center" label="单位"/>
                 <el-table-column prop="fillDept" align="center" label="部门"/>
-                <el-table-column prop="fillPost" align="center" label="身份"/>
+                <el-table-column prop="fillPost" align="center" label="职务/名称"/>
                 <el-table-column prop="fillTel" align="center" label="电话"/>
                 <el-table-column prop="fillMail" align="center" label="邮箱"/>
                 <el-table-column prop="fillFile" align="center" label="资料">
                   <template slot-scope="scope">
                     <span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
-                    <span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
+                    <span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id, 'onLine')">
                     {{ item.name }} {{ ';' }}
+                      <el-button
+                        size="mini"
+                        @click="previews(item.id, 'down')"
+                        icon="el-icon-download"
+                        style="height: 25px; margin-left: 5px;"
+                      ></el-button>
                    </span>
                   </template>
                 </el-table-column>
@@ -417,10 +423,14 @@ export default {
       this.$preview(attId)
     },
     /** 点击对应附件进行下载*/
-    previews(val) {
+    previews(val,type) {
       let attId = val
       if (attId != null && attId !== "") {
+        if (type === 'down') {
           window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        } else {
+          this.$preview(attId)
+        }
       }
     },
   }

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue

@@ -176,7 +176,7 @@
                     {{ scope.row.fillDept || '' }}
                   </template>
                 </el-table-column>
-                <el-table-column prop="fillPost" align="center" label="身份">
+                <el-table-column prop="fillPost" align="center" label="职务/名称">
                   <template slot-scope="scope">
                     {{ scope.row.fillPost || '' }}
                   </template>
@@ -368,6 +368,7 @@
         accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
         :http-request="httpRequest"
         :before-upload="handleBeforeUpload"
+        :on-preview="handlePreview"
         :before-remove="handleBeforeRemove"
         :on-success="handleOnsuccess"
       >
@@ -625,6 +626,13 @@ export default {
       this.fileListData.fillFile = this.reData
     },
 
+    handlePreview(file) {
+      let attId = file.id
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      }
+    },
+
     handleClose() {
       this.upDialog = false
     },

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue

@@ -114,7 +114,7 @@
                 <el-table-column prop="fillPeople" align="center" label="参与人"/>
                 <el-table-column prop="fillUnit" align="center" label="单位"/>
                 <el-table-column prop="fillDept" align="center" label="部门"/>
-                <el-table-column prop="fillPost" align="center" label="身份"/>
+                <el-table-column prop="fillPost" align="center" label="职务/名称"/>
                 <el-table-column prop="fillTel" align="center" label="电话"/>
                 <el-table-column prop="fillMail" align="center" label="邮箱"/>
                 <el-table-column prop="fillFile" align="center" label="资料">

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue

@@ -125,7 +125,7 @@
                 <el-table-column prop="fillPeople" align="center" label="参与人"/>
                 <el-table-column prop="fillUnit" align="center" label="单位"/>
                 <el-table-column prop="fillDept" align="center" label="部门"/>
-                <el-table-column prop="fillPost" align="center" label="身份"/>
+                <el-table-column prop="fillPost" align="center" label="职务/名称"/>
                 <el-table-column prop="fillTel" align="center" label="电话"/>
                 <el-table-column prop="fillMail" align="center" label="邮箱"/>
                 <el-table-column prop="fillFile" align="center" label="资料">

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue

@@ -312,7 +312,7 @@
         name="file"
         drag
         :file-list="ch_pageData.fileTextList"
-        accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
+        accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF,.pptx"
         :http-request="httpRequest"
         :before-upload="handleBeforeUpload"
         :before-remove="handleBeforeRemove"
@@ -539,7 +539,7 @@ export default {
       // 判断上传文件格式
       if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip'
         || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF'
-        || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' || fileSuffix === '.PPT'
+        || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' || fileSuffix === '.pptx'
         || fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.bmp'
       ) {
         return true

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

@@ -1695,6 +1695,17 @@ export default {
     filterText(val) {
       this.$refs.tree.filter(val);
     },
+    'form.standInData' : {
+      handler: function () {
+        if(this.form.standInData === '1') {
+          this.rules.standYear[0].required = false;
+          this.rules.standName[0].required = false
+        } else {
+          this.rules.standYear[0].required = true;
+          this.rules.standName[0].required = true
+        }
+      }
+    },
     /*'form.standInData': {
       handler: function (val) {
         this.verifySarStandard = false
@@ -1840,14 +1851,10 @@ export default {
         this.rules.standName[0].required = false
         this.rules.standEnName[0].required = true;
         this.rules.standNature[0].required = false
-        this.rules.standYear[0].required = false;
-        this.rules.standName[0].required = false
       } else {
         this.rules.standName[0].required = true
         this.rules.standNature[0].required = true
         this.rules.standEnName[0].required = false;
-        this.rules.standYear[0].required = true;
-        this.rules.standName[0].required = true
       }
       this.standardSearchForm.standType = val === '0' ? 'INLAND' : 'FOREIGN'
       //切换清空表单
@@ -3054,6 +3061,8 @@ export default {
                       this.isSubmit = false
                     }
                   })
+                } else {
+                  this.isSubmit = false
                 }
               })
             } else {

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

@@ -158,6 +158,7 @@
                     :disabled="true"
                 ></custom-date-pick-group>
                 <custom-date-pick-group
+                    :labelWidth="210"
                     :key="'zccssrq'"
                     :config="{attrName:'在产车实施日期(标准文本)',attrField:'zccssrq'}"
                     v-model="form.zccssrq"
@@ -184,6 +185,7 @@
               </el-col>
               <el-col :span="12">
                 <custom-date-pick-group
+                    :labelWidth="210"
                     :key="'zccssrq'"
                     :config="{attrName:'新车型实施日期(标准文本)',attrField:'zccssrq'}"
                     v-model="form.xcxssrq"
@@ -421,14 +423,14 @@
                     ></el-option>
                   </el-select>
                 </el-form-item>-->
-                <el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" class="add-form-item form-item-disabled">
+                <el-form-item label="关联模块--乘用车vpps中文名称" label-width="210px" prop="cycvppscn" class="add-form-item form-item-disabled">
                   <el-input
                       v-model="form.cycvppscn"
                       disabled
                       clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="关联模块--卡车vpps中文名称" prop="kccvppscn" class="add-form-item form-item-disabled">
+                <el-form-item label="关联模块--卡车vpps中文名称" label-width="210px" prop="kccvppscn" class="add-form-item form-item-disabled">
                   <el-input
                       v-model="form.kccvppscn"
                       disabled

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>
@@ -1688,14 +1689,10 @@ export default {
         this.rules.standName[0].required = false
         this.rules.standEnName[0].required = true;
         this.rules.standNature[0].required = false
-        this.rules.standYear[0].required = false;
-        this.rules.standName[0].required = false
       } else {
         this.rules.standName[0].required = true
         this.rules.standNature[0].required = true
         this.rules.standEnName[0].required = false;
-        this.rules.standYear[0].required = true;
-        this.rules.standName[0].required = true
       }
       this.standardSearchForm.standType = val === '0' ? 'INLAND' : 'FOREIGN'
     },
@@ -2662,6 +2659,17 @@ export default {
         }
       }
     },
+    'form.standInData' : {
+      handler: function () {
+        if(this.form.standInData === '1') {
+          this.rules.standYear[0].required = false;
+          this.rules.standName[0].required = false
+        } else {
+          this.rules.standYear[0].required = true;
+          this.rules.standName[0].required = true
+        }
+      }
+    },
     form(val){
       if(this.form){
 

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

@@ -162,6 +162,11 @@
               <div>{{ stateText(scope.row.state) }}</div>
             </template>
           </el-table-column>
+          <el-table-column
+                  prop="cause"
+                  align="center"
+                  label="原因">
+          </el-table-column>
         </el-table>
       </div>
       <el-collapse accordion>

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

@@ -162,7 +162,7 @@
                     <el-input v-model="roleForm.ministerUser" style="display: none;"/>
                     <el-input
                       v-model="roleForm.ministerUserName"
-                      placeholder="选择标准法规部部长·"
+                      placeholder="选择标准法规部部长"
                       @click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"
                     />
                   </div>

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

@@ -164,12 +164,18 @@
               </div>
             </template>
           </el-table-column>
+          <el-table-column
+                  prop="cause"
+                  align="center"
+                  label="原因">
+          </el-table-column>
           <el-table-column
                   label="操作"
                   width="100"
                   align="center">
             <template slot-scope="scope">
-              <el-button :disabled="scope.row.state !== '2'"
+              <!--                      :disabled="scope.row.state !== '2'"-->
+              <el-button
                          class="common-button-primary"
                          size="mini"
                          type="primary"
@@ -315,6 +321,13 @@
                     maxlength="500"
             ></el-input>
           </el-form-item>
+          <el-form-item label="原因" prop="cause" class="add-form-item" >
+            <el-input
+                    v-model="editForm.cause"
+                    placeholder="请输入原因"
+                    maxlength="500"
+            ></el-input>
+          </el-form-item>
         </el-form>
       </div>
       <div id="roleFormButton3" class="demo-drawer-footer">
@@ -346,6 +359,10 @@
           oldText: '',
           newText: '',
           reason: '',
+          cause: '',
+          department: '',
+          responUserName: '',
+          state: '',
         },
         itermsConditionsFlag: false,
         itermsConditionsTitle: '',
@@ -436,6 +453,8 @@
             this.data[a].oldText = this.editForm.oldText
             this.data[a].newText = this.editForm.newText
             this.data[a].reason = this.editForm.reason
+            this.data[a].cause = this.editForm.cause
+            this.$set(this.data, a,this.editForm)
           }
         }
         this.modalshowflag2 = false
@@ -452,6 +471,10 @@
           oldText: row.oldText,
           newText: row.newText,
           reason: row.reason,
+          cause: row.cause,
+          department: row.department,
+          responUserName: row.responUserName,
+          state: row.state
         }
       },
       itermsConditionsClose () {
@@ -536,6 +559,16 @@
         });
       },
       handleSubmit() {
+        let a = 0
+        for (let b = 0; b < this.data.length;b++) {
+          if (this.data[b].state === '3' && !this.data[b].cause) {
+            a++
+          }
+        }
+        if (a > 0) {
+          this.$message.warning('请输入不上报原因')
+          return;
+        }
         this.isSubmit = true;
           var json = this.json;
           json.oldinfo = this.oldData;
@@ -567,6 +600,9 @@
             this.form.cid = data.form ? data.form.cid : data.cid
             this.form.endTime = data.form ? data.form.endTime : data.endTime
             data.info.forEach(item => {
+              if (!item.source) {
+                item.source = '1'
+              }
               if (item.state) {
               } else {
                 item.state = "1";
@@ -584,6 +620,7 @@
                   item.chapterNumber = item.partCode;
                   item.responUserName = item.userName;
                   item.state = '1'
+                  item.source = '2'
                   this.data.push(item);
                 });
               });

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

@@ -76,6 +76,14 @@
                     - -
                   </div>
                 </el-form-item>
+                <el-form-item label="审批领导" prop="user7" class="add-form-item form-item-disabled">
+                  <el-input
+                          v-model="form.user7"
+                          style="display: none;"
+                          clearable
+                  ></el-input>
+                  <el-input v-model="form.user7Name" readonly placeholder="请选择审批领导" @click.native="choiceZRR"></el-input>
+                </el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -165,6 +173,11 @@
               <div>{{ stateText(scope.row.state) }}</div>
             </template>
           </el-table-column>
+          <el-table-column
+                  prop="cause"
+                  align="center"
+                  label="原因">
+          </el-table-column>
         </el-table>
       </div>
       <el-collapse accordion>
@@ -265,6 +278,13 @@
         <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
       </div>
     </el-dialog>
+    <Role-tree
+            check-box
+            is-title="选择审批领导"
+            :is-visible.sync="modalshowflag"
+            @checkedRole="checkedRole2"
+            :nodeList="nodeList"
+    ></Role-tree>
   </div>
 </template>
 
@@ -316,6 +336,8 @@ export default {
           textType: '',
           modelList: [],
           modelNameList: '',
+          user7: '',
+          user7Name: ''
         },
         formRules: {
           responUserList: [
@@ -331,6 +353,17 @@ export default {
       ProcessTitle
     },
     methods: {
+      choiceZRR () {
+        this.nodeList = [];
+        if (this.form.user7) {
+          this.nodeList.push(this.form.user7)
+        }
+        this.modalshowflag = true;
+      },
+      checkedRole2(data) {
+        this.form.user7 = data[0].id
+        this.form.user7Name = data[0].name
+      },
       filesUpload (file) { // 下载
         const attId = file.attId
         if (attId) {
@@ -416,12 +449,11 @@ export default {
               reason: "修改理由",
               department: "提出部门",
               responUserName: "提出人",
+              stateText: "处理意见",
+              cause: "原因",
             },
             dataList: []
           };
-        if (title === '上报意见.xls') {
-          params.columnName.stateText = "处理意见"
-        }
           params.dataList = JSON.parse(JSON.stringify(row));
           params.dataList.forEach(item => {
             if (item.state === "1") {
@@ -446,6 +478,8 @@ export default {
         var json = this.json;
         json.hqFlag = '0';
         json.commentText = this.commentText6;
+        json.user7 = this.form.user7;
+        json.user7Name = this.form.user7Name;
         this.$http.post("lawss/activiti/completeTask", {
           json: JSON.stringify(json),
           taskId: this.taskIds,
@@ -492,6 +526,8 @@ export default {
             this.form.endTime = data.endTime || data.form.endTime;
             this.form.textType = data.textType || data.form.textType
             this.form.modelList = data.modelList || data.form.modelList
+            this.form.user7 = data.form ? data.form.user7 : (data.user7 ? data.user7 :  '')
+            this.form.user7Name = data.form ? data.form.user7Name : (data.user7Name ? data.user7Name :  '')
             this.oldData = JSON.parse(JSON.stringify(data.info))
             var arr = []
             data.info.forEach(item => {

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

@@ -165,6 +165,11 @@
               <div>{{ stateText(scope.row.state) }}</div>
             </template>
           </el-table-column>
+          <el-table-column
+                  prop="cause"
+                  align="center"
+                  label="原因">
+          </el-table-column>
         </el-table>
       </div>
       <el-collapse accordion>
@@ -406,12 +411,11 @@ export default {
             reason: "修改理由",
             department: "提出部门",
             responUserName: "提出人",
+            stateText: "处理意见",
+            cause: "原因",
           },
           dataList: []
         };
-        if (title === '上报意见.xls') {
-          params.columnName.stateText = "处理意见"
-        }
         params.dataList = JSON.parse(JSON.stringify(row));
         params.dataList.forEach(item => {
           if (item.state === "1") {

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

@@ -165,6 +165,11 @@
               <div>{{ stateText(scope.row.state) }}</div>
             </template>
           </el-table-column>
+          <el-table-column
+                  prop="cause"
+                  align="center"
+                  label="原因">
+          </el-table-column>
         </el-table>
       </div>
       <el-collapse accordion>
@@ -410,12 +415,11 @@ export default {
             reason: "修改理由",
             department: "提出部门",
             responUserName: "提出人",
+            stateText: "处理意见",
+            cause: "原因",
           },
           dataList: []
         };
-        if (title === '上报意见.xls') {
-          params.columnName.stateText = "处理意见"
-        }
         params.dataList = JSON.parse(JSON.stringify(row));
         params.dataList.forEach(item => {
           if (item.state === "1") {

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

@@ -165,6 +165,11 @@
               <div>{{ stateText(scope.row.state) }}</div>
             </template>
           </el-table-column>
+          <el-table-column
+                  prop="cause"
+                  align="center"
+                  label="原因">
+          </el-table-column>
         </el-table>
       </div>
       <el-collapse accordion>
@@ -409,12 +414,11 @@ export default {
             reason: "修改理由",
             department: "提出部门",
             responUserName: "提出人",
+            stateText: "处理意见",
+            cause: "原因",
           },
           dataList: []
         };
-        if (title === '上报意见.xls') {
-          params.columnName.stateText = "处理意见"
-        }
         params.dataList = JSON.parse(JSON.stringify(row));
         params.dataList.forEach(item => {
           if (item.state === "1") {

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/processCenter/pages/phone/bzzqyj/step6.vue

@@ -137,6 +137,11 @@
                             <div>{{ stateText(scope.row.state) }}</div>
                         </template>
                     </el-table-column>
+                    <el-table-column
+                            prop="cause"
+                            align="center"
+                            label="原因">
+                    </el-table-column>
                 </el-table>
             </div>
             <el-collapse accordion>
@@ -329,12 +334,11 @@
                             reason: "修改理由",
                             department: "提出部门",
                             responUserName: "提出人",
+                            stateText: "处理意见",
+                            cause: "原因",
                         },
                         dataList: []
                     };
-                    if (title === '上报意见.xls') {
-                        params.columnName.stateText = "处理意见"
-                    }
                     params.dataList = JSON.parse(JSON.stringify(row));
                     params.dataList.forEach(item => {
                         if (item.state === "1") {

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

@@ -137,6 +137,11 @@
                             <div>{{ stateText(scope.row.state) }}</div>
                         </template>
                     </el-table-column>
+                    <el-table-column
+                            prop="cause"
+                            align="center"
+                            label="原因">
+                    </el-table-column>
                 </el-table>
             </div>
             <el-collapse accordion>
@@ -329,12 +334,11 @@
                             reason: "修改理由",
                             department: "提出部门",
                             responUserName: "提出人",
+                            stateText: "处理意见",
+                            cause: "原因",
                         },
                         dataList: []
                     };
-                    if (title === '上报意见.xls') {
-                        params.columnName.stateText = "处理意见"
-                    }
                     params.dataList = JSON.parse(JSON.stringify(row));
                     params.dataList.forEach(item => {
                         if (item.state === "1") {

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

@@ -137,6 +137,11 @@
                             <div>{{ stateText(scope.row.state) }}</div>
                         </template>
                     </el-table-column>
+                    <el-table-column
+                            prop="cause"
+                            align="center"
+                            label="原因">
+                    </el-table-column>
                 </el-table>
             </div>
             <el-collapse accordion>
@@ -329,12 +334,11 @@
                             reason: "修改理由",
                             department: "提出部门",
                             responUserName: "提出人",
+                            stateText: "处理意见",
+                            cause: "原因",
                         },
                         dataList: []
                     };
-                    if (title === '上报意见.xls') {
-                        params.columnName.stateText = "处理意见"
-                    }
                     params.dataList = JSON.parse(JSON.stringify(row));
                     params.dataList.forEach(item => {
                         if (item.state === "1") {

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

@@ -137,6 +137,11 @@
                             <div>{{ stateText(scope.row.state) }}</div>
                         </template>
                     </el-table-column>
+                    <el-table-column
+                            prop="cause"
+                            align="center"
+                            label="原因">
+                    </el-table-column>
                 </el-table>
             </div>
             <el-collapse accordion>
@@ -344,12 +349,11 @@
                             reason: "修改理由",
                             department: "提出部门",
                             responUserName: "提出人",
+                            stateText: "处理意见",
+                            cause: "原因",
                         },
                         dataList: []
                     };
-                    if (title === '上报意见.xls') {
-                        params.columnName.stateText = "处理意见"
-                    }
                     params.dataList = JSON.parse(JSON.stringify(row));
                     params.dataList.forEach(item => {
                         if (item.state === "1") {

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({
                       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);
+          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, {

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -3713,7 +3713,7 @@ export default {
             }
             break
           case 'textStatus' :
-            this.orderBy = 5;
+            this.orderBy = 4;
             this.nowOrder = sortObj.column.order
             if (this.nowOrder === 'ascending') {
               this.nowOrder = 2