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

src/pages/details/otherStandardDetails/index.vue

@@ -722,17 +722,11 @@
               prop="xccssrq"
               label="新车型实施日期(文本)"
               width="180">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xccssrq ? $moment(scope.row.xccssrq).format('YYYY-MM-DD') : '' }}</span>
-            </template>
           </el-table-column>
           <el-table-column
               prop="zccssrq"
               label="在产车实施日期(文本)"
               width="170">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format('YYYY-MM-DD') : '' }}</span>
-            </template>
           </el-table-column>
           <el-table-column
               show-overflow-tooltip

src/pages/localTool/standardWarning.vue

@@ -113,6 +113,9 @@
                 </el-row>
               </el-form>
             </div>
+            <div style="float: right;margin: 0 3% 10px 0">
+              <el-button type="primary" size="mini" @click="exportExcelBtn">导出Excel</el-button>
+            </div>
             <div class="content">
 <!--              <el-divider content-position="left" class="dynamic-child-title">实施日期预警</el-divider>-->
               <el-table
@@ -123,7 +126,13 @@
                   :resizable="false"
                   :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                   v-loading="warningTableLoading"
+                  @selection-change="selectChange"
               >
+                <el-table-column
+                    type="selection"
+                    width="55"
+                    align="center">
+                </el-table-column>
                 <el-table-column prop="standType" label="类型" width="100" align="center">
                   <template slot-scope="scope">
                     <div v-if="scope.row.sortName === 'BUSINESS_STAND'">企业标准</div>
@@ -199,17 +208,33 @@
       </div>
     </div>
     <adc-back-top scroll-bind="dynamicInformation"></adc-back-top>
+    <!--导出模态框区域-->
+    <el-dialog :visible.sync="exportModelFlag" title="导出文件" width="300px">
+      <el-form :inline="true" class="label-input-form search-area">
+        <el-form-item label="导出名称" class="search-item">
+          <el-input v-model="exportName" placeholder="请输入导出文件名称" :maxlength="30" clearable label="导出名称"/>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="demo-drawer-footer">
+          <el-button size="mini" class="common-button-default" icon="el-icon-close" @click="cancal">取消</el-button>
+          <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check"
+                     @click="exportExcel">提交</el-button>
+        </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import {mapMutations} from "vuex";
+import {interfaceUrl} from "@/sysConfig";
 
 export default {
   name: "standardWarning",
   data() {
     return {
-      //
+      selectedList: [],
+      exportName: '',
+      exportModelFlag: false,
       warningTableDatas:[],
       warningTableHeight: '',
       applyArcticOptions: [], // 适用车型下拉框
@@ -259,6 +284,31 @@ export default {
     };
   },
   methods: {
+    //取消导出
+    cancal() {
+      this.exportModelFlag = false
+    },
+    //确认导出
+    exportExcel() {
+      console.log('293',this.selectedList)
+      const exportURL = interfaceUrl + 'sys/EarlyWarning/exportWarning?' +
+           '&ids=' + this.selectedList.join(',') + '&exportName=' + this.exportName
+      window.open(exportURL)
+      this.$message.success('导出信息成功')
+      this.exportModelFlag = false
+    },
+    exportExcelBtn(){
+      console.log('302',this.selectedList)
+      this.exportName = ''
+      this.exportModelFlag = true
+    },
+    selectChange(alldata){
+      console.log('307',alldata)
+      this.selectedList = []
+      for (let i = 0; i < alldata.length; i++) {
+        this.selectedList.push(alldata[i]['id'])
+      }
+    },
     // 获取标准预警数据 (type用于区别分页器切换)
     getEarlyDate() {
       this.warningTableLoading = true

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

@@ -61,7 +61,12 @@
                 <el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
                   <span v-if="uploadFileLength < 1">{{ '-' }}</span>
                   <span v-for="item in ch_pageData.fileTextList" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
-                    {{ item.name }} {{ ';' }}
+                    <a v-if="item.name.length > 30">
+                      {{ item.name.slice(0,30) + '...' }} {{ ';' }}
+                    </a>
+                    <a v-else>
+                      {{ item.name }} {{ ';' }}
+                    </a>
                    </span>
                 </el-form-item>
               </el-col>

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

@@ -61,7 +61,12 @@
                 <el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
                   <span v-if="uploadFileLength < 1">{{ '-' }}</span>
                   <span v-for="item in ch_pageData.fileTextList" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
-                    {{ item.name }} {{ ';' }}
+                     <a v-if="item.name.length > 30">
+                      {{ item.name.slice(0,30) + '...' }} {{ ';' }}
+                    </a>
+                    <a v-else>
+                      {{ item.name }} {{ ';' }}
+                    </a>
                    </span>
                 </el-form-item>
               </el-col>

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

@@ -61,7 +61,12 @@
                 <el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
                   <span v-if="uploadFileLength < 1">{{ '-' }}</span>
                   <span v-for="item in ch_pageData.fileTextList" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
-                    {{ item.name }} {{ ';' }}
+                     <a v-if="item.name.length > 30">
+                      {{ item.name.slice(0,30) + '...' }} {{ ';' }}
+                    </a>
+                    <a v-else>
+                      {{ item.name }} {{ ';' }}
+                    </a>
                    </span>
                 </el-form-item>
               </el-col>

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

@@ -61,7 +61,12 @@
                 <el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
                   <span v-if="uploadFileLength < 1">{{ '-' }}</span>
                   <span v-for="item in ch_pageData.fileTextList" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
-                    {{ item.name }} {{ ';' }}
+                     <a v-if="item.name.length > 30">
+                      {{ item.name.slice(0,30) + '...' }} {{ ';' }}
+                    </a>
+                    <a v-else>
+                      {{ item.name }} {{ ';' }}
+                    </a>
                    </span>
                 </el-form-item>
               </el-col>

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue

@@ -61,7 +61,12 @@
                 <el-form-item  class="add-form-item"  label="上传附件:" prop="uploadFile">
                   <span v-if="uploadFileLength < 1">{{ '-' }}</span>
                   <span v-for="item in ch_pageData.fileTextList" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
-                    {{ item.name }} {{ ';'}}
+                     <a v-if="item.name.length > 30">
+                      {{ item.name.slice(0,30) + '...' }} {{ ';' }}
+                    </a>
+                    <a v-else>
+                      {{ item.name }} {{ ';' }}
+                    </a>
                    </span>
                 </el-form-item>
               </el-col>

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

@@ -64,7 +64,12 @@
                 <el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
                   <span v-if="uploadFileLength < 1">{{ '-' }}</span>
                   <span v-for="item in ch_pageData.fileTextList" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
-                    {{ item.name }} {{ ';' }}
+                     <a v-if="item.name.length > 30">
+                      {{ item.name.slice(0,30) + '...' }} {{ ';' }}
+                    </a>
+                    <a v-else>
+                      {{ item.name }} {{ ';' }}
+                    </a>
                    </span>
                 </el-form-item>
               </el-col>

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

@@ -97,12 +97,24 @@
               </el-date-picker>
             </el-form-item>
             <el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
-              <el-input
-                readonly
-                v-model="qbfsForm.unit"
-                placeholder="请输入起草责任单位"
-                clearable
-              ></el-input>
+              <div v-if="qbfsForm.unit.length > 0">
+                <el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.unit"
+                    placeholder="请输入起草责任单位"
+                    clearable
+                  ></el-input>
+                </el-tooltip>
+              </div>
+              <div v-else>
+                <el-input
+                  readonly
+                  v-model="qbfsForm.unit"
+                  placeholder="请输入起草责任单位"
+                  clearable
+                ></el-input>
+              </div>
             </el-form-item>
           </el-col>
         </el-row>

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

@@ -105,12 +105,24 @@
              </el-date-picker>
            </el-form-item>
            <el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
-             <el-input
-               readonly
-               v-model="qbfsForm.unit"
-               placeholder="请输入起草责任单位"
-               clearable
-             ></el-input>
+             <div v-if="qbfsForm.unit.length > 0">
+               <el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start">
+                 <el-input
+                   readonly
+                   v-model="qbfsForm.unit"
+                   placeholder="请输入起草责任单位"
+                   clearable
+                 ></el-input>
+               </el-tooltip>
+             </div>
+             <div v-else>
+               <el-input
+                 readonly
+                 v-model="qbfsForm.unit"
+                 placeholder="请输入起草责任单位"
+                 clearable
+               ></el-input>
+             </div>
            </el-form-item>
            <el-form-item label="延期后标准发布时间" prop="yqReleaseTime" class="add-form-item form-item-disabled">
              <el-date-picker

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

@@ -64,33 +64,33 @@
           placeholder="请选择计划标准发布时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" class="add-form-item" prop="unit" >
-        <div style="display: flex;justify-content: space-between;align-items: center;">
-            <el-input
-              clearable
-              v-model="qbfsForm.unit"
-              placeholder="选择或输入起草单位">
-            </el-input>
-          <div>
-            <el-button
-              size="mini"
-              type="primary"
-              @click="QCDWClick"
-              class="common-button-primary">手动查找</el-button>
-          </div>
-        </div>
-      </el-form-item>
-<!--      <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unit" class="add-form-item form-item-disabled">-->
-<!--        <el-select v-model="qbfsForm.unit" filterable multiple  clearable>-->
-<!--          <el-option-->
-<!--            v-for="item in qcdwOptions"-->
-<!--            placeholder="请选择起草责任单位"-->
-<!--            :key="item.value"-->
-<!--            :value="item.label"-->
-<!--            :label="item.label"-->
-<!--          ></el-option>-->
-<!--        </el-select>-->
+<!--      <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" class="add-form-item" prop="unit" >-->
+<!--        <div style="display: flex;justify-content: space-between;align-items: center;">-->
+<!--            <el-input-->
+<!--              clearable-->
+<!--              v-model="qbfsForm.unit"-->
+<!--              placeholder="选择或输入起草单位">-->
+<!--            </el-input>-->
+<!--          <div>-->
+<!--            <el-button-->
+<!--              size="mini"-->
+<!--              type="primary"-->
+<!--              @click="QCDWClick"-->
+<!--              class="common-button-primary">手动查找</el-button>-->
+<!--          </div>-->
+<!--        </div>-->
 <!--      </el-form-item>-->
+      <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unit" class="add-form-item form-item-disabled">
+        <el-select v-model="qbfsForm.unit" filterable multiple  clearable>
+          <el-option
+            v-for="item in qcdwOptions"
+            placeholder="请选择起草责任单位"
+            :key="item.value"
+            :value="item.label"
+            :label="item.label"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="新增原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
         <el-input
           type="textarea"
@@ -185,7 +185,7 @@ export default {
       },
       qbfsFormRules: {
         unit: [
-          {required: true, message: '请输入单位', trigger: 'blur'},
+          {required: true, message: '请选择起草单位', trigger: 'change'},
         ],
         esName: [
           {required: true, message: '请输入企标名称', trigger: 'blur'},

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

@@ -81,22 +81,33 @@
                 placeholder="请选择初稿完成时间">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" class="add-form-item" prop="unit" >
-              <div style="display: flex;justify-content: space-between;align-items: center;">
-                  <el-input
-                    clearable
-                    v-model="qbfsForm.unit"
-                    placeholder="选择或输入起草单位">
-                  </el-input>
-                <div>
-                  <el-button
-                    size="mini"
-                    type="primary"
-                    @click="QCDWClick"
-                    class="common-button-primary">手动查找</el-button>
-                </div>
-              </div>
+            <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unit" class="add-form-item form-item-disabled">
+              <el-select v-model="qbfsForm.unit" filterable multiple  clearable>
+                <el-option
+                  v-for="item in qcdwOptions"
+                  placeholder="请选择起草责任单位"
+                  :key="item.value"
+                  :value="item.label"
+                  :label="item.label"
+                ></el-option>
+              </el-select>
             </el-form-item>
+<!--            <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" class="add-form-item" prop="unit" >-->
+<!--              <div style="display: flex;justify-content: space-between;align-items: center;">-->
+<!--                  <el-input-->
+<!--                    clearable-->
+<!--                    v-model="qbfsForm.unit"-->
+<!--                    placeholder="选择或输入起草单位">-->
+<!--                  </el-input>-->
+<!--                <div>-->
+<!--                  <el-button-->
+<!--                    size="mini"-->
+<!--                    type="primary"-->
+<!--                    @click="QCDWClick"-->
+<!--                    class="common-button-primary">手动查找</el-button>-->
+<!--                </div>-->
+<!--              </div>-->
+<!--            </el-form-item>-->
           </el-col>
           <el-col :span="12">
             <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
@@ -340,7 +351,7 @@ export default {
           {required: true, message: '请选择合并计划企标名称', trigger: 'blur'},
         ],
         unit: [
-          {required: true, message: '请输入单位', trigger: 'blur'},
+          {required: true, message: '请选择起草单位', trigger: 'change'},
         ],
         esName: [
           {required: true, message: '请输入企标名称', trigger: 'blur'},

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

@@ -96,12 +96,24 @@
               </el-date-picker>
             </el-form-item>
             <el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
-              <el-input
-                readonly
-                v-model="qbfsForm.unit"
-                placeholder="请输入起草责任单位"
-                clearable
-              ></el-input>
+             <div v-if="qbfsForm.unit.length > 0">
+               <el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start">
+                 <el-input
+                   readonly
+                   v-model="qbfsForm.unit"
+                   placeholder="请输入起草责任单位"
+                   clearable
+                 ></el-input>
+               </el-tooltip>
+             </div>
+              <div v-else>
+                <el-input
+                  readonly
+                  v-model="qbfsForm.unit"
+                  placeholder="请输入起草责任单位"
+                  clearable
+                ></el-input>
+              </div>
             </el-form-item>
             <el-form-item label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
               <el-input