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

public/static/pdf/web/viewer.js

@@ -6649,13 +6649,13 @@ var PDFPageView = function () {
           watermark_txt: msg,
           watermark_x: 50,//水印起始位置x轴坐标
           watermark_y: 0,//水印起始位置Y轴坐标
-          watermark_rows: 10,//水印行数
+          watermark_rows: 7,//水印行数
-          watermark_cols: 3,//水印列数
+          watermark_cols: 5,//水印列数
-          watermark_x_space: 30,//水印x轴间隔
+          watermark_x_space: 80,//水印x轴间隔
-          watermark_y_space: 100,//水印y轴间隔
+          watermark_y_space: 120,//水印y轴间隔
           watermark_color: 'rgba(192, 192, 192)',//水印字体颜色
           watermark_alpha: 0.3,//水印透明度
-          watermark_fontsize: '50px',//水印字体大小
+          watermark_fontsize: '30px',//水印字体大小
           watermark_font: '微软雅黑',//水印字体
           watermark_width: 120,//水印宽度
           watermark_height: 80,//水印长度

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

@@ -265,7 +265,7 @@ export default {
       total: 0,
       total2: 0,
       pageSize: this.$store.getters.userInfo.configContent,
-      sideClose: false,
+      sideClose: true,
       data: [], // table数据
       treeLoading: false,
       Loading: false,

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

@@ -313,7 +313,7 @@ export default {
       },
       nodeList2: [],
       modalflag: false,
-      sideClose: false, // 边栏收展状态
+      sideClose: true, // 边栏收展状态
       filterText: '',
       treeData: [],
       defaultProps: {

src/pages/localTool/standardWarning.vue

@@ -12,6 +12,8 @@
             <h5>实施预警</h5>
           </div>
             <div class="more">
+              <el-row :gutter="24">
+                <el-col span="24">
                   <el-form :inline="true" :model="dynamic" class="demo-form-inline">
                     <el-form-item label="标准编号">
                       <el-input clearable size="mini"
@@ -25,13 +27,23 @@
                                 placeholder="根据标准名称查找">
                       </el-input>
                     </el-form-item>
-                <el-form-item label="实施日期" style="margin-right: -40px" class="choose-time-area">
+                    <el-form-item label="实施日期" style="margin-right: 10px" class="choose-time-area">
-                  <el-datePicker
+                      <el-date-picker
-                    clearable size="mini"
+                        size="mini"
+                        clearable
                         v-model="dynamic.putTime"
                         value-format="yyyy-MM-dd"
-                    placeholder="根据实施日期查找">
+                        type="daterange"
-                  </el-datePicker>
+                        range-separator="-"
+                        start-placeholder="开始日期"
+                        end-placeholder="结束日期">
+                      </el-date-picker>
+                      <!--                  <el-datePicker-->
+                      <!--                    clearable size="mini"-->
+                      <!--                    v-model="dynamic.putTime"-->
+                      <!--                    value-format="yyyy-MM-dd"-->
+                      <!--                    placeholder="根据实施日期查找">-->
+                      <!--                  </el-datePicker>-->
                     </el-form-item>
                     <el-form-item label="适用车型">
                       <el-input clearable size="mini"
@@ -43,7 +55,6 @@
                       <el-button
                         type="primary"
                         size="mini"
-                    v-btn-permission="'5dca375c3d8d57c45e4815acf3611b34'"
                         @click="searchBtnClick"
                         class="common-button-primary">
                         查询
@@ -51,15 +62,13 @@
                       <el-button
                         size="mini"
                         @click="clearBtnClick"
-                    v-btn-permission="'8258ee44344e92365e7e5bd90f3c8d21'"
                         class="common-button-primary">
                         清空
                       </el-button>
-                </div>
-<!--                <el-form-item>-->
                       <!--                  <el-button-->
                       <!--                    type="primary"-->
                       <!--                    size="mini"-->
+                      <!--                    v-btn-permission="'5dca375c3d8d57c45e4815acf3611b34'"-->
                       <!--                    @click="searchBtnClick"-->
                       <!--                    class="common-button-primary">-->
                       <!--                    查询-->
@@ -67,11 +76,14 @@
                       <!--                  <el-button-->
                       <!--                    size="mini"-->
                       <!--                    @click="clearBtnClick"-->
+                      <!--                    v-btn-permission="'8258ee44344e92365e7e5bd90f3c8d21'"-->
                       <!--                    class="common-button-primary">-->
                       <!--                    清空-->
                       <!--                  </el-button>-->
-<!--                </el-form-item>-->
+                    </div>
                   </el-form>
+                </el-col>
+              </el-row>
             </div>
             <div class="content" style="height: 100%; padding-top: 50px; ">
               <el-divider content-position="left" class="dynamic-child-title">新车型实施日期预警</el-divider>
@@ -97,7 +109,7 @@
                     <a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
                   </template>
                 </el-table-column>
-                <el-table-column prop="standName" label="标准名称" align="center">
+                <el-table-column prop="standName" width="320" label="标准名称" align="center">
                   <template slot-scope="scope">
                     <a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
                   </template>
@@ -109,16 +121,6 @@
                 </el-table-column>
                 <el-table-column prop="applyType" label="适用车型" align="center">
                 </el-table-column>
-                <el-table-column label="标准类型" align="center">
-                  <template slot-scope="scope">
-                    <div>{{ scope.row.standCode.split(' ')[0] }}</div>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
-                  <template slot-scope="scope">
-                    <div>{{ scope.row.dutyEngineer }}</div>
-                  </template>
-                </el-table-column>
                 <el-table-column label="操作" align="center" v-if="isShowBtn">
                   <template slot-scope="scope">
                     <el-button
@@ -160,7 +162,7 @@
                     <a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
                   </template>
                 </el-table-column>
-                <el-table-column prop="standName" label="标准名称" align="center">
+                <el-table-column prop="standName" width="320" label="标准名称" align="center">
                   <template slot-scope="scope">
                     <a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
                   </template>
@@ -172,16 +174,6 @@
                 </el-table-column>
                 <el-table-column prop="applyType" label="适用车型" align="center">
                 </el-table-column>
-                <el-table-column label="标准类型" align="center">
-                  <template slot-scope="scope">
-                    <div>{{ scope.row.standCode.split(' ')[0] }}</div>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
-                  <template slot-scope="scope">
-                    <div>{{ scope.row.dutyEngineer }}</div>
-                  </template>
-                </el-table-column>
                 <el-table-column label="操作" align="center" v-if="isShowBtn">
                   <template slot-scope="scope">
                     <el-button
@@ -214,7 +206,7 @@
                     <a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
                   </template>
                 </el-table-column>
-                <el-table-column prop="standName" label="标准名称" align="center">
+                <el-table-column prop="standName" width="320" label="标准名称" align="center">
                   <template slot-scope="scope">
                     <a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
                   </template>
@@ -236,17 +228,6 @@
                 </el-table-column>
                 <el-table-column prop="applyType" label="适用车型" align="center">
                 </el-table-column>
-                <el-table-column prop="mark" label="标准分类" align="center">
-                  <template slot-scope="scope">
-                    <!--                        <a @click="showStandDetails(scope.row)">{{ scope.row.mark }}</a>-->
-                    <div>{{ scope.row.standCode.split(' ')[0] }}</div>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
-                  <template slot-scope="scope">
-                    <div>{{ scope.row.dutyEngineer }}</div>
-                  </template>
-                </el-table-column>
                 <el-table-column label="操作" align="center" v-if="isShowBtn">
                   <template slot-scope="scope">
                     <el-button
@@ -279,7 +260,7 @@
                     <a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
                   </template>
                 </el-table-column>
-                <el-table-column prop="standName" label="标准名称" align="center">
+                <el-table-column prop="standName" width="320" label="标准名称" align="center">
                   <template slot-scope="scope">
                     <a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
                   </template>
@@ -301,17 +282,6 @@
                 </el-table-column>
                 <el-table-column prop="applyType" label="适用车型" align="center">
                 </el-table-column>
-                <el-table-column prop="mark" label="标准分类" align="center">
-                  <template slot-scope="scope">
-                    <div>{{ scope.row.standCode.split(' ')[0] }}</div>
-                    <!--                        <a @click="showStandDetails(scope.row)">{{ scope.row.mark }}</a>-->
-                  </template>
-                </el-table-column>
-                <el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
-                  <template slot-scope="scope">
-                    <div>{{ scope.row.dutyEngineer }}</div>
-                  </template>
-                </el-table-column>
                 <el-table-column label="操作" align="center" v-if="isShowBtn">
                   <template slot-scope="scope">
                     <el-button
@@ -659,7 +629,8 @@ export default {
         //标准名称
         standName: this.dynamic.standName,
         //实施日期
-        putTime: this.dynamic.putTime,
+        putTime: this.dynamic.putTime[0],
+        lastTime: this.dynamic.putTime[1],
         //适用车型
         applyType: this.dynamic.applyType
       }, {
@@ -1100,6 +1071,7 @@ export default {
         }
 
         .more {
+           width: 100%;
            margin-top: 30px;
           /deep/ .el-input__inner {
             width: 155px;
@@ -1107,7 +1079,7 @@ export default {
 
           .choose-time-area {
             /deep/ .el-input__inner {
-              width: 170px;
+              width: 220px;
             }
           }
 
@@ -1207,6 +1179,10 @@ export default {
         .content {
           padding-bottom: 10px;
           height: calc(~'100% - 40px');
+            /deep/.el-button--mini{
+              padding: 5px 7px;
+              font-size: 8px;
+            }
         }
       }
 

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

@@ -29,6 +29,17 @@
                                         <el-radio label="1">海外标准入库</el-radio>
                                     </el-radio-group>
                                 </el-form-item>
+                              <el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled" v-show="form.standInData === '0'">
+                                <el-select :popper-append-to-body="false" filterable v-model="form.standSort" placeholder="请选择标准类别">
+                                  <el-option
+                                      v-for="item in standSortOptions"
+                                      placeholder="请选择"
+                                      :key="item.value"
+                                      :value="item.value"
+                                      :label="item.label"
+                                  ></el-option>
+                                </el-select>
+                              </el-form-item>
                                 <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
                                     <el-input
                                             v-model="form.standNumber"
@@ -36,6 +47,13 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
+                              <el-form-item v-if="verifySarStandard" 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="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
                                     <el-input
                                             v-model="form.standName"
@@ -43,30 +61,14 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
-                                <el-form-item label="是否需要会签" prop="signFlag" class="add-form-item form-item-disabled">
+                              <el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
-                                    <el-radio-group v-model="form.signFlag">
-                                        <el-radio label="1">是</el-radio>
-                                        <el-radio label="2">否</el-radio>
-                                    </el-radio-group>
-                                </el-form-item>
-                                <el-form-item v-if="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
                                 <el-input
-                                            v-model="form.standYear"
+                                    v-model="form.standEnName"
-                                            placeholder="请输入标准标准年份"
+                                    placeholder="请输入标准英文名称"
                                     clearable
                                 ></el-input>
                               </el-form-item>
-                                <el-form-item v-if="verifySarStandard" label="文本状态" prop="textStatus" class="add-form-item form-item-disabled">
+
-                                    <el-select :popper-append-to-body="false" v-model="form.textStatus" placeholder="请选择文本状态">
-                                        <el-option
-                                                v-for="item in standStateOptions"
-                                                placeholder="请选择"
-                                                :key="item.value"
-                                                :value="item.value"
-                                                :label="item.label"
-                                        ></el-option>
-                                    </el-select>
-                                </el-form-item>
                                 <el-form-item v-if="verifySarStandard" label="标准发布日期" prop="issueTime" class="add-form-item form-item-disabled">
                                     <el-date-picker
                                             v-model="form.issueTime"
@@ -88,18 +90,17 @@
                                   ></el-option>
                                 </el-select>
                               </el-form-item>
-                                <el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
+
-                                    <el-select :popper-append-to-body="false" filterable v-model="form.standSort" placeholder="请选择标准类别">
+                              <el-form-item label="是否需要会签" prop="signFlag" class="add-form-item form-item-disabled">
-                                        <el-option
+                                <el-radio-group v-model="form.signFlag">
-                                                v-for="item in standSortOptions"
+                                  <el-radio label="1">是</el-radio>
-                                                placeholder="请选择"
+                                  <el-radio label="2">否</el-radio>
-                                                :key="item.value"
+                                </el-radio-group>
-                                                :value="item.value"
-                                                :label="item.label"
-                                        ></el-option>
-                                    </el-select>
                               </el-form-item>
-                                <el-form-item label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
+
+
+
+                                <el-form-item label="标准性质" prop="standNature" class="add-form-item form-item-disabled" v-show="form.standInData === '0'">
                                     <el-select :popper-append-to-body="false" v-model="form.standNature" placeholder="请选择标准性质">
                                         <el-option
                                                 v-for="item in standNatureOptions"
@@ -110,13 +111,7 @@
                                         ></el-option>
                                     </el-select>
                                 </el-form-item>
-                                <el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
+
-                                    <el-input
-                                            v-model="form.standEnName"
-                                            placeholder="请输入标准英文名称"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
 
                                 <el-form-item class="add-form-item form-item-disabled" style="margin-left: -210px">
                                     <el-button
@@ -145,6 +140,17 @@
                                             :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
                                             :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
                                 </el-form-item>
+                              <el-form-item v-if="verifySarStandard" label="文本状态" prop="textStatus" class="add-form-item form-item-disabled">
+                                <el-select :popper-append-to-body="false" v-model="form.textStatus" placeholder="请选择文本状态">
+                                  <el-option
+                                      v-for="item in standStateOptions"
+                                      placeholder="请选择"
+                                      :key="item.value"
+                                      :value="item.value"
+                                      :label="item.label"
+                                  ></el-option>
+                                </el-select>
+                              </el-form-item>
                                 <el-form-item v-if="verifySarStandard && form.standInData === '1'"  label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
                                     <el-input
                                             v-model="form.gxhbq"
@@ -503,17 +509,17 @@
                     <div class="prc-content-border" v-show="verifySarStandard">
                         <el-row :gutter="24">
                             <el-col :span="12">
-                                <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
+<!--                                <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">-->
-                                    <el-select :popper-append-to-body="false" v-model="form.zrbm" placeholder="请选择责任部门" multiple>
+<!--                                    <el-select :popper-append-to-body="false" v-model="form.zrbm" placeholder="请选择责任部门" multiple>-->
-                                        <el-option
+<!--                                        <el-option-->
-                                                v-for="item in zrbmOptions"
+<!--                                                v-for="item in zrbmOptions"-->
-                                                placeholder="请选择"
+<!--                                                placeholder="请选择"-->
-                                                :key="item.value"
+<!--                                                :key="item.value"-->
-                                                :value="item.value"
+<!--                                                :value="item.value"-->
-                                                :label="item.label"
+<!--                                                :label="item.label"-->
-                                        ></el-option>
+<!--                                        ></el-option>-->
-                                    </el-select>
+<!--                                    </el-select>-->
-                                </el-form-item>
+<!--                                </el-form-item>-->
                                 <el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled">
                                     <el-select :popper-append-to-body="false" v-model="form.cllx" placeholder="请选择适用车型" multiple>
                                         <el-option
@@ -590,7 +596,7 @@
                                   </el-select>
                                 </el-form-item>
                                 <el-form-item v-show="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
-                                    <el-select :popper-append-to-body="false" v-model="form.qcdw" placeholder="请选择起草单位" multiple>
+                                    <el-select :popper-append-to-body="false" v-model="form.qcdw" placeholder="请选择起草单位" multiple filterable>
                                         <el-option
                                                 v-for="item in qcdwOption"
                                                 placeholder="请选择"
@@ -635,17 +641,17 @@
                                         ></el-option>
                                     </el-select>
                                 </el-form-item>
-                                <el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
+<!--                                <el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">-->
-                                    <el-select :popper-append-to-body="false" v-model="form.zrgcs" placeholder="请选择责任工程师" multiple>
+<!--                                    <el-select :popper-append-to-body="false" v-model="form.zrgcs" placeholder="请选择责任工程师" multiple>-->
-                                        <el-option
+<!--                                        <el-option-->
-                                                v-for="item in zrgcsOptions"
+<!--                                                v-for="item in zrgcsOptions"-->
-                                                placeholder="请选择"
+<!--                                                placeholder="请选择"-->
-                                                :key="item.value"
+<!--                                                :key="item.value"-->
-                                                :value="item.value"
+<!--                                                :value="item.value"-->
-                                                :label="item.label"
+<!--                                                :label="item.label"-->
-                                        ></el-option>
+<!--                                        ></el-option>-->
-                                    </el-select>
+<!--                                    </el-select>-->
-                                </el-form-item>
+<!--                                </el-form-item>-->
                                 <el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" class="add-form-item form-item-disabled">
                                     <el-input
                                             v-model="form.cycvppscn"
@@ -914,7 +920,7 @@
                     :on-remove="removeOneFile"
                     :show-file-list="true"
             >
-                <div style="padding: 20px 0">
+                <div>
                     <i class="el-icon-upload" style="color: #3399ff"></i>
                     <p>点击或拖拽上传文件</p>
                 </div>
@@ -1203,7 +1209,7 @@
                 <el-button
                         round
                         class="common-button-primary"
-                        icon="el-icon-check"
+                        icon="el-icon-plus"
                         type="primary"
                         @click="handleProcessStandardNext(1)">新增</el-button>
                 <el-button
@@ -1211,7 +1217,7 @@
                         class="common-button-primary"
                         icon="el-icon-check"
                         type="primary"
-                        @click="handleProcessStandardNext(2)">带入</el-button>
+                        @click="handleProcessStandardNext(2)">确认</el-button>
                 <el-button
                         round
                         class="common-button-default"
@@ -1485,7 +1491,7 @@
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
                     ],
                   standEnName: [
-                    { required: true, message: '请输入标准英文名称', trigger: 'blur' },
+                    { required: false, message: '请输入标准英文名称', trigger: 'blur' },
                     { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
                   ],
                     standNature: [
@@ -1553,6 +1559,14 @@
                 handler: function(val) {
                     this.verifySarStandard = false
                     this.standardSearchForm.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
+
+                  // 国内英文名称不必填 国外必填
+                    if(this.form.standInData === '1'){
+                        this.rules.standEnName[0].required=true;
+                    }else {
+                      this.rules.standEnName[0].required=false;
+                    }
+
                   //切换清空表单
                   this.form= {
                     // 基础信息
@@ -1718,9 +1732,10 @@
               this.verifySarStandard = this.$route.query.verifySarStandard
               let mes = JSON.parse(res.mes)
               mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
-              this.form = mes.form
               this.roleForm = mes.roleForm
               this.commentText = mes.commentText
+              //表单文件处理
+              this.getFormFieldList(mes.form)
             })
           },
           // 将文本状态的id与name对应
@@ -2597,6 +2612,8 @@
             },
             //保存
             handleSave() {
+              //文件处理
+              this.fileInfoHandle();
               this.form.country=this.countryArr;
               // if(item.country !== undefined && item.country !== null){
               //   this.sarStandardsInfoEO.country = item.country.split(",");
@@ -2768,6 +2785,29 @@
 <style lang="less" scoped>
     @import '~@/assets/styles/style';
     .bzrkStep1 {
+      /deep/ .el-upload-dragger {
+        background-color: #fff;
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        box-sizing: border-box;
+        width: 360px;
+        height: 90px;
+        text-align: center;
+        position: relative;
+        overflow: hidden;
+      }
+      /deep/ .el-dialog__body {
+        padding: 0 20px 10px;
+        color: #606266;
+        font-size: 14px;
+        word-break: break-all;
+      }
+      /deep/ .el-upload-list__item-name {
+        white-space: inherit;
+      }
+      /deep/ .el-upload-dragger .el-icon-upload {
+        margin: 10px 0 0 0;
+      }
         /deep/.el-drawer__container {
             .prc-content-border {
                 border: none;

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

@@ -1344,7 +1344,14 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew,saveTaskForPub,queryTaskFirst} from 'api/process'
+import {
+  inboundLiaisonDetail,
+  processCreateStand,
+  changeAssigneeNew,
+  saveTaskForPub,
+  queryTaskFirst,
+  saveTaskFirst
+} from 'api/process'
 import TreeSelect from '@/components/treeSelect/treeSelect.vue';
 import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
 
@@ -1591,7 +1598,6 @@ export default {
       prcName : this.$route.query.prcName,
       // 调整处理人抽屉状态
       drawerModal: false,
-      drawerTitle: '',
       nodeList: [],
       selectPeople:'',
     }
@@ -1628,9 +1634,11 @@ export default {
       }).then(res => {
         let mes = JSON.parse(res.mes)
         mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
-        this.form = mes.form
         this.roleForm = mes.roleForm
         this.commentText = mes.commentText
+        this.taskIds=mes.taskIds
+        //表单文件处理
+        this.getFormFieldList(mes.form)
       })
     },
     choiceZRR1 (type, title, id) {
@@ -2001,7 +2009,7 @@ export default {
             break;
           default : ;
         }
-        console.log("caNmae",this.form.caName);
+        // console.log("caNmae",this.form.caName);
         this.$message({
           showClose: true,
           message: response.message,
@@ -2072,7 +2080,7 @@ export default {
       this.fileMadel = true
 
     },fileChange(fileList){
-      console.log("fileList",fileList);
+      // console.log("fileList",fileList);
     },
     // popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
     //   if(checkedData) {
@@ -2209,6 +2217,7 @@ export default {
             this.getFormFieldList(processForm)
           }
         }).catch(e => {
+          console.log("错误")
         })
       })
     },
@@ -2313,18 +2322,24 @@ export default {
       this.active = name
     },
     handleSave() {
+      //表单文件处理
+      this.fileInfoHandle();
       this.form.country=this.countryArr;
       this.saveLoading = true
       let _formData = new FormData()
       // _formData.append('id', this.bpnId)
+      _formData.append('createUser', this.$store.getters.userInfo.userId)
+      _formData.append('createUserName', this.$store.getters.userInfo.uName)
+      _formData.append('prcType', '1')
       _formData.append('taskIds', this.taskIds)
       _formData.append('json', JSON.stringify({
         form: this.form,
         roleForm: this.roleForm,
         commentText: this.commentText,
         taskInfo: '申请人修订',
+        taskIds:this.taskIds
       }))
-      saveTaskForPub(_formData).then(res => {
+      saveTaskFirst(_formData).then(res => {
         this.saveLoading = false
         this.$message.success('保存成功')
         // this.bpnId = res.result

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

@@ -2,7 +2,7 @@
 <template>
   <div class="xmpg-step1">
     <ProcessHeader toggle>
-      <template slot="proName">项目合规评估流程</template>
+      <template slot="proName">标准合规评估流程</template>
       <template slot="proNode">发起流程</template>
     </ProcessHeader>
     <div class="headerTabs">
@@ -395,6 +395,41 @@
       <div class="demo-drawer-content">
         <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
           <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
+            <div class="left">
+              <el-form :modal="projectSearch" :inline="true" class="label-input-form" style="margin-left:10px">
+                <el-form-item label="产品线" class="search-item search-item-last">
+                  <el-input
+                    v-model="projectSearch.productLine"
+                    placeholder="请输入产品线"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="产品线责任人" class="search-item search-item-last">
+                  <el-input
+                    v-model="projectSearch.uname"
+                    placeholder="请输入产品线责任人"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    :loading="searching"
+                    type="primary"
+                    class="common-button-primary"
+                    size="small"
+                    v-btn-permission=""
+                    @click="getProductData">
+                    查询
+                  </el-button>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    class="common-button-default"
+                    size="small"
+                    v-btn-permission=""
+                    @click="clearProject">清空
+                  </el-button>
+                </el-form-item>
+              </el-form>
+            </div>
             <el-table
               :data="productData"
               tooltip-effect="dark"
@@ -490,6 +525,10 @@ export default {
         standType: "",
         standName: ""
       },
+      projectSearch: {
+        productLine: '',
+        uname: '',
+      },
       standardTypeOptions: [
         {
           value: "INLAND",
@@ -933,11 +972,20 @@ export default {
       this.pageSizeNo = this.$store.getters.userInfo.configContent;
       this.getProductData();
     },
+    //清空产品线数据
+    clearProject(){
+      this.projectSearch = {
+        productLine: '',
+        uname: '',
+      }
+      this.getProductData()
+    },
     //获取产品线数据
     getProductData() {
       this.$http.get("sarStandProjectLibrary/queryProjectManager", {
         current: this.pageNo,
-        pageSize: this.pageSizeNo
+        PageSize: this.pageSizeNo,
+        ...this.projectSearch
       }, {
         _this: this
       }, res => {

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

@@ -2,7 +2,7 @@
 <template>
   <div class="xmpg-step2">
     <ProcessHeader toggle>
-      <template slot="proName">项目合规评估流程</template>
+      <template slot="proName">标准合规评估流程</template>
       <template slot="proNode">业务经理审批流程</template>
     </ProcessHeader>
     <div class="headerTabs">

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

@@ -2,7 +2,7 @@
 <template>
   <div class="xmpg-step7">
     <ProcessHeader toggle>
-      <template slot="proName">项目合规评估流程</template>
+      <template slot="proName">标准合规评估流程</template>
       <template slot="proNode">标准法规部领导审批</template>
     </ProcessHeader>
     <div class="headerTabs">

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

@@ -2,7 +2,7 @@
 <template>
   <div class="xmpg-step1">
     <ProcessHeader toggle>
-      <template slot="proName">项目合规评估流程</template>
+      <template slot="proName">标准合规评估流程</template>
       <template slot="proNode">发起流程</template>
     </ProcessHeader>
     <div class="headerTabs">
@@ -397,6 +397,41 @@
       <div class="demo-drawer-content">
         <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
           <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
+            <div class="left">
+              <el-form :modal="projectSearch" :inline="true" class="label-input-form" style="margin-left:10px">
+                <el-form-item label="产品线" class="search-item search-item-last">
+                  <el-input
+                    v-model="projectSearch.productLine"
+                    placeholder="请输入产品线"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="产品线责任人" class="search-item search-item-last">
+                  <el-input
+                    v-model="projectSearch.uname"
+                    placeholder="请输入产品线责任人"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    :loading="searching"
+                    type="primary"
+                    class="common-button-primary"
+                    size="small"
+                    v-btn-permission=""
+                    @click="getProductData">
+                    查询
+                  </el-button>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    class="common-button-default"
+                    size="small"
+                    v-btn-permission=""
+                    @click="clearProject">清空
+                  </el-button>
+                </el-form-item>
+              </el-form>
+            </div>
             <el-table
               :data="productData"
               tooltip-effect="dark"
@@ -488,6 +523,10 @@ export default {
       // 查询相关参数
       searching: false,
       fileType: "FBGBJBD",
+      projectSearch: {
+        productLine: '',
+        uname: '',
+      },
       standardSearch: {
         standType: "",
         standName: ""
@@ -930,11 +969,20 @@ export default {
       this.pageSizeNo = this.$store.getters.userInfo.configContent;
       this.getProductData();
     },
+    //清空产品线数据
+    clearProject(){
+      this.projectSearch = {
+        productLine: '',
+        uname: '',
+      }
+      this.getProductData()
+    },
     //获取产品线数据
     getProductData() {
       this.$http.get("sarStandProjectLibrary/queryProjectManager", {
         current: this.pageNo,
-        pageSize: this.pageSizeNo
+        PageSize: this.pageSizeNo,
+        ...this.projectSearch
       }, {
         _this: this
       }, res => {

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

@@ -2,7 +2,7 @@
 <template>
   <div class="xmpg-step2">
     <ProcessHeader toggle>
-      <template slot="proName">项目合规评估流程</template>
+      <template slot="proName">标准合规评估流程</template>
       <template slot="proNode">业务经理审批流程</template>
     </ProcessHeader>
     <div class="headerTabs">

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

@@ -2,7 +2,7 @@
 <template>
   <div class="xmpg-step3">
     <ProcessHeader toggle>
-      <template slot="proName">项目合规评估流程</template>
+      <template slot="proName">标准合规评估流程</template>
       <template slot="proNode">分发责任人分发任务</template>
     </ProcessHeader>
     <div class="headerTabs">

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

@@ -2,7 +2,7 @@
 <template>
   <div class="xmpg-step4">
     <ProcessHeader toggle>
-      <template slot="proName">项目合规评估流程</template>
+      <template slot="proName">标准合规评估流程</template>
       <template slot="proNode">落实人填写评估反馈</template>
     </ProcessHeader>
     <div class="headerTabs">

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

@@ -2,7 +2,7 @@
 <template>
   <div class="xmpg-step5">
     <ProcessHeader toggle>
-      <template slot="proName">项目合规评估流程</template>
+      <template slot="proName">标准合规评估流程</template>
       <template slot="proNode">分发责任人审批</template>
     </ProcessHeader>
     <div class="headerTabs">

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

@@ -2,7 +2,7 @@
 <template>
   <div class="xmpg-step6">
     <ProcessHeader toggle>
-      <template slot="proName">项目合规评估流程</template>
+      <template slot="proName">标准合规评估流程</template>
       <template slot="proNode">产品线责任人审批</template>
     </ProcessHeader>
     <div class="headerTabs">

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

@@ -2,7 +2,7 @@
 <template>
   <div class="xmpg-step7">
     <ProcessHeader toggle>
-      <template slot="proName">项目合规评估流程</template>
+      <template slot="proName">标准合规评估流程</template>
       <template slot="proNode">标准法规部领导审批</template>
     </ProcessHeader>
     <div class="headerTabs">

src/pages/processCenter/pages/newProcess/index.vue

@@ -75,7 +75,7 @@
                 <img :src="getImg(Math.floor(Math.random() * 6))">
               </div>
               <div class="card-top-right">
-                <div class="card-top-right-text">项目合规评估流程-标准</div>
+                <div class="card-top-right-text">标准合规评估流程</div>
                 <div class="card-top-right-line"></div>
               </div>
             </div>

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -1894,7 +1894,7 @@ export default {
       loading: false,
       importLoading: false,
       isCollapse: true,
-      sideClose: false, // 边栏收展状态
+      sideClose: true, // 边栏收展状态
       isAdvancedSearch: false, // 高级检索窗口是否打开
       replaceStandNumModel: false,
       lawsExplainQuoteModel: false,

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

@@ -1961,7 +1961,7 @@ export default {
         creationTime: ''
       },
       removeOneId: '',
-      sideClose: false, // 边栏收展状态
+      sideClose: true, // 边栏收展状态
       twoOptions: [],
       threeOptions: [],
       orgData: [],

src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue

@@ -2129,7 +2129,7 @@
           creationTime: ''
         },
         removeOneId: '',
-        sideClose: false, // 边栏收展状态
+        sideClose: true, // 边栏收展状态
         twoOptions: [],
         threeOptions: [],
         orgData: [],

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -1751,7 +1751,7 @@ export default {
       // 分页查询过程中用到的对象
       loading: false,
       isCollapse: true,
-      sideClose: false, // 边栏收展状态
+      sideClose: true, // 边栏收展状态
       isAdvancedSearch: false, // 高级检索窗口是否打开
       replaceStandNumModel: false,
       lawsExplainQuoteModel: false,

src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue

@@ -93,11 +93,6 @@
         :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '15px',
              fontWeight: 'normal', height: '48px'}"
         @selection-change="handleSelectionChange">
-        <el-table-column
-          type="selection"
-          width="55"
-          align="center">
-        </el-table-column>
         <el-table-column
           show-overflow-tooltip
           prop="projectPlatfor"

src/pages/regulatoryRepository/nonConfomity/index.vue

@@ -7,7 +7,7 @@
            <rectification-database></rectification-database>
          </el-tab-pane>
          <el-tab-pane label="重点问题项管控" name="keynote">
-           <key-issues></key-issues>
+           <key-issues :keynoteActiveName="keynoteActiveName"></key-issues>
          </el-tab-pane>
        </el-tabs>
      </div>
@@ -24,12 +24,25 @@ export default {
   },
   data () {
     return {
-      activeName: 'database'
+      activeName: 'database',
+      keynoteActiveName: 'cause'
     }
   },
   methods: {
     handleClick(tab, event) {
+    },
+    getActiveName(){
+      if (this.$route.query.activeName){
+        this.activeName = this.$route.query.activeName
       }
+      if (this.$route.query.keynoteActiveName){
+        this.keynoteActiveName = this.$route.query.keynoteActiveName
+      }
+      console.log('35',this.keynoteActiveName)
+    }
+  },
+  created() {
+    this.getActiveName()
   },
   watch: {},
   mounted () {}

src/pages/regulatoryRepository/nonConfomity/pages/businessDetails.vue

@@ -373,7 +373,10 @@ export default {
     },
     back() {
       this.$router.push({
-        name: 'NonConfomity'
+        name: 'NonConfomity',
+        query:{
+          activeName:'keynote'
+        }
       })
     },
 // 清空 查询条件

src/pages/regulatoryRepository/nonConfomity/pages/keyIssues.vue

@@ -2,7 +2,7 @@
 <template>
 <div id="key-issues">
   <div class="non-content">
-    <el-tabs v-model="activeName" @tab-click="handleClick">
+    <el-tabs v-model="keynoteActiveName" @tab-click="handleClick">
       <el-tab-pane label="事业部" name="cause">
         <business-division></business-division>
       </el-tab-pane>
@@ -20,6 +20,7 @@ import productDepartment from "@/pages/regulatoryRepository/nonConfomity/pages/p
 
 export default {
   name: "keyIssues",
+  props:['keynoteActiveName'],
  components: {
    businessDivision,
    productDepartment,

src/pages/regulatoryRepository/nonConfomity/pages/productDetails.vue

@@ -556,7 +556,11 @@ export default {
     },
     back () {
       this.$router.push({
-        name: 'NonConfomity'
+        name: 'NonConfomity',
+        query:{
+          activeName:'keynote',
+          keynoteActiveName:'product'
+        }
       })
     },
     // 未符合项table selected事件