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

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

@@ -108,7 +108,8 @@
             label="标准号">
             <template slot-scope="scope">
               <a v-if="scope.row.standYear" class="table-jump"
-                 @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber
+                 @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                  scope.row.standNumber
                 }}-{{ scope.row.standYear }}</a>
               <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
                 {{ scope.row.standNumber }}</a>
@@ -301,6 +302,8 @@
               height="100%"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
+              @row-click="rowClick"
+              @select="select"
               @selection-change="selectListChange"
               ref="selection"
             >
@@ -321,7 +324,8 @@
               >
                 <template slot-scope="scope">
                   <a class="table-jump" @click.stop="showTable(scope.row)">{{
-                      scope.row.detailedListName }}</a>
+                      scope.row.detailedListName
+                    }}</a>
                 </template>
               </el-table-column>
               <el-table-column
@@ -340,7 +344,8 @@
                 align="center">
                 <template slot-scope="scope">
             <span
-              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
+              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{
+                scope.row.detailedListVision
               }}</span>
                 </template>
               </el-table-column>
@@ -368,6 +373,8 @@
               height="100%"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
+              @row-click="rowClick"
+              @select="select"
               @selection-change="selectListChange"
               ref="selection"
             >
@@ -388,7 +395,8 @@
               >
                 <template slot-scope="scope">
                   <a class="table-jump" @click.stop="showTable(scope.row)">{{
-                      scope.row.detailedListName }}</a>
+                      scope.row.detailedListName
+                    }}</a>
                 </template>
               </el-table-column>
               <el-table-column
@@ -407,7 +415,8 @@
                 align="center">
                 <template slot-scope="scope">
             <span
-              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
+              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{
+                scope.row.detailedListVision
               }}</span>
                 </template>
               </el-table-column>
@@ -417,7 +426,8 @@
                 align="center">
                 <template slot-scope="scope">
             <span
-              v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
+              v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{
+                scope.row.applicationScope
               }}</span>
                 </template>
               </el-table-column>
@@ -428,7 +438,8 @@
                 align="center">
                 <template slot-scope="scope">
                   <div>
-                    {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-D hh:mm:ss") : scope.row.updateTime
+                    {{
+                      scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-D hh:mm:ss") : scope.row.updateTime
                     }}
                   </div>
                 </template>
@@ -448,6 +459,8 @@
               height="100%"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
+              @row-click="rowClick"
+              @select="select"
               @selection-change="selectListChange"
               ref="selection"
             >
@@ -468,7 +481,8 @@
               >
                 <template slot-scope="scope">
                   <a class="table-jump" @click.stop="showTable(scope.row)">{{
-                      scope.row.detailedListName }}</a>
+                      scope.row.detailedListName
+                    }}</a>
                 </template>
               </el-table-column>
               <el-table-column
@@ -487,7 +501,8 @@
                 align="center">
                 <template slot-scope="scope">
             <span
-              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
+              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{
+                scope.row.detailedListVision
               }}</span>
                 </template>
               </el-table-column>
@@ -497,7 +512,8 @@
                 align="center">
                 <template slot-scope="scope">
             <span
-              v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
+              v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{
+                scope.row.applicationScope
               }}</span>
                 </template>
               </el-table-column>
@@ -508,7 +524,8 @@
                 align="center">
                 <template slot-scope="scope">
                   <div>
-                    {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD hh:mm:ss") : scope.row.updateTime
+                    {{
+                      scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD hh:mm:ss") : scope.row.updateTime
                     }}
                   </div>
                 </template>
@@ -616,7 +633,8 @@
                       scope.row.standNumber
                     }}-{{ scope.row.standYear }}</a>
                   <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
-                      scope.row.standSortShow }}
+                      scope.row.standSortShow
+                    }}
                     {{ scope.row.standNumber }}</a>
                 </template>
               </el-table-column>
@@ -728,7 +746,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { saveTaskFirst, queryTaskFirst } from "api/process";
+import {saveTaskFirst, queryTaskFirst} from "api/process";
 import seeDatalis from "@/pages/localTool/standContrast/pages/seeDatalis";
 
 export default {
@@ -778,21 +796,21 @@ export default {
       },
       formRules: {
         listType: [
-          { required: true, message: "请选择清单类型", trigger: "change" }
+          {required: true, message: "请选择清单类型", trigger: "change"}
         ],
         listName: [
-          { required: true, message: "请填写清单名称", trigger: "change" }
+          {required: true, message: "请填写清单名称", trigger: "change"}
         ]
       },
       roleFormRules: {
         dockUserName: [
-          { required: true, message: "请选择会签责任人", trigger: "change" }
+          {required: true, message: "请选择会签责任人", trigger: "change"}
         ],
         ministerUserName: [
-          { required: true, message: "请选择修订责任人", trigger: "change" }
+          {required: true, message: "请选择修订责任人", trigger: "change"}
         ],
         directorUserName: [
-          { required: true, message: "请选择审批责任人", trigger: "change" }
+          {required: true, message: "请选择审批责任人", trigger: "change"}
         ]
       },
       dataList: [],//清单里的标准数据
@@ -947,14 +965,14 @@ export default {
           _this: this
         }, res => {
           this.sarAccessListDatas = res.data.records;
-          this.sarAccessListDatas.forEach(item =>{
+          this.sarAccessListDatas.forEach(item => {
             // 适用车型转换
             if (item.carType !== null) {
               let k = (item.carType || "").split(',')
               for (let i in this.energyKindOptions) {
-                for (let m = 0; m< k.length; m++) {
+                for (let m = 0; m < k.length; m++) {
                   if (this.energyKindOptions[i].value === k[m]) {
-                    k[m]  = this.energyKindOptions[i].label
+                    k[m] = this.energyKindOptions[i].label
                   }
                   item.carType = k.join(',')
                 }
@@ -1064,6 +1082,7 @@ export default {
     //保存事件
     handleSave() {
       this.saveLoading = true;
+      this.listForm.fileName = this.fileInfoList
       let _formData = new FormData();
       _formData.append("id", this.bpnId || "");
       _formData.append("createUser", this.$store.getters.userInfo.userId);
@@ -1089,13 +1108,14 @@ export default {
         this.$message.warning("标准不能为空");
       } else {
         this.listForm.commentText = this.commentText
+        this.listForm.fileName = this.fileInfoList
         var json = Object.assign(this.listForm, this.roleForm);
         this.$refs["qdfbForm"].validate((valid) => {
           if (valid) {
             this.$refs["Form"].validate((valid) => {
               if (valid) {
                 this.isSubmit = true
-                this.$http.get("lawss/activiti/startProcess", { type: "4" }, {
+                this.$http.get("lawss/activiti/startProcess", {type: "4"}, {
                   _this: this
                 }, res => {
                   if (res.ok) {
@@ -1126,14 +1146,11 @@ export default {
     },
     // 删除上传的文件
     delFileInfo(file, fileList) {
-      let middle = [];
+      this.fileInfoList.forEach((item, index) => {
-      let files = [];
+        if (item.name === file.name || item.id === file.id) {
-      fileList.forEach(item => {
+          this.fileInfoList.splice(index, 1)
-        middle.push(item.name);
+        }
-        files.push(item.response.data.id);
+      })
-      });
-      this.fileListName = middle;
-      this.fileIds = files;
     },
     fileUpload() {
       this.fileMadel = true;
@@ -1141,24 +1158,7 @@ export default {
     // 上传文件成功回调
     uploadBackSuccess(res, file, fileList) {
       if (res.ok) {
-        let middle = [];
+        this.fileInfoList.push(res.data)
-        fileList.forEach(item => {
-          middle.push(item.name);
-        });
-        this.fileListName = middle;
-        this.fileIds.push(file.response.data.id);
-        // this.listForm.fileName =  this.fileListName.join(',');
-        // this.listForm.fileId = this.fileIds.join(',');
-        // if (this.listForm.fileName === null || this.listForm.fileName === undefined) {
-        //   this.listForm.fileName = this.fileListName.join(",");
-        // } else {
-        //   this.listForm.fileName = this.listForm.fileName + "," + this.fileListName.join(",");
-        // }
-        // if (this.listForm.fileId === null || this.listForm.fileId === undefined) {
-        //   this.listForm.fileId = this.fileIds.join(",");
-        // } else {
-        //   this.listForm.fileId = this.listForm.fileId + "," + this.fileIds.join(",");
-        // }
         this.$message.success("上传成功");
       } else {
         this.$message.error(res.message);
@@ -1290,38 +1290,51 @@ export default {
     //选择清单确定事件
     OkDrawer() {
       if (this.selectedList.length === 1) {
-        let deposit = new Map();
+        this.listForm.standId = this.selectedList[0].id;
-        this.sarAccessListDatas.forEach(item => {
+        this.listForm.listName = this.selectedList[0].detailedListName;
-          deposit.set(item.id, item);
+        this.listForm.descriptionList = this.selectedList[0].remark;
-        });
+        // 将查询出的文件名字和id组合成数组
-        let bringData = [];
+        if (this.selectedList[0].fileName !== null) {
-        for (let i = 0; i < this.selectedList.length; i++) {
+          let textName = this.selectedList[0].fileName.split(',').map(item => {
-          bringData.push(deposit.get(this.selectedList[i]));
+            return {
+              name: item
+            }
+          })
+          let textId = this.selectedList[0].fileIds.split(',').map(item => {
+            return {
+              id: item
+            }
+          })
+          textName.forEach(item => {
+            this.$set(item, 'id', '')
+          })
+          for (let i = 0; i < textName.length; i++) {
+            textName[i].id = textId[i].id
+          }
+          this.fileInfoList = textName
+        } else {
+          this.fileInfoList = []
         }
-        this.listForm.standId = bringData[0].id;
-        this.listForm.listName = bringData[0].detailedListName;
-        this.listForm.descriptionList = bringData[0].remark;
-        this.listForm.fileId = bringData[0].fileIds;
-        this.listForm.fileName = bringData[0].fileName;
         this.ListModel = false;
+
         this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById",
-          { id: bringData[0].id, page: this.page, Size: this.pageSize }, {
+          {id: this.selectedList[0].id, page: this.page, Size: this.pageSize}, {
             _this: this
           }, res => {
-            if (res.data.records == null) {
+            if (res.data === null) {
-              res.data.records = [];
+              this.dataList = [];
             }
             this.dataList = res.data.records;
             this.dataList.forEach(item => {
-              if (item.xcxssrqgj === null){
+              if (item.xcxssrqgj === null) {
                 this.$set(item, "XCXSSRQ", '');
                 this.$set(item, "ZCCSSRQ", '');
-              }else{
+              } else {
                 this.$set(item, "XCXSSRQ", item.xcxssrqgj);
                 this.$set(item, "ZCCSSRQ", item.zccssrqgj);
               }
             })
-            this.listForm.dataList = res.data;
+            this.listForm.dataList = res.data.records;
             let formId = [];
             this.dataList.map(item => {
               formId.push(item.id);
@@ -1329,8 +1342,6 @@ export default {
             this.listForm.inforlist = formId.join(",");
           }, e => {
           });
-      } else if (this.selectedList.length > 1) {
-        this.$message.warning("只能选择一条数据进行带入");
       } else {
         this.$message.warning("请选择一条数据进行带入");
       }
@@ -1339,9 +1350,36 @@ export default {
     selectListChange(data) {
       this.selectedList = [];
       for (let i = 0; i < data.length; i++) {
-        this.selectedList.push(data[i].id);
+        this.selectedList.push(data[0]);
       }
     },
+    // 表格某一行的单击事件
+    rowClick(row, column) {
+      const selectData = this.selectList
+      this.$refs.selection.clearSelection()
+      if (selectData.length === 1) {
+        selectData.forEach(item => {
+          // 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
+          if (item === row) {
+            this.$refs.selection.toggleRowSelection(row, false);
+          }
+          // 不然就让当前的一行勾选
+          else {
+            this.$refs.selection.toggleRowSelection(row, true);
+          }
+        })
+      } else {
+        this.$refs.selection.toggleRowSelection(row, true);
+      }
+    },
+    select(selection, row) {
+      // 清除 所有勾选项
+      this.$refs.selection.clearSelection()
+      // 当表格数据都没有被勾选的时候 就返回
+      // 主要用于将当前勾选的表格状态清除
+      if (selection.length === 0) return
+      this.$refs.selection.toggleRowSelection(row, true)
+    },
     //标准表格选择框改变
     selectStandChange(data) {
       this.selectList = [];

src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue

@@ -37,26 +37,21 @@
                 ></el-input>
               </el-form-item>
               <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
-                <div class="file-box" v-if="fileList.length > 0">
+                <el-upload
-                  <p v-for="item in fileList"
+                  :action="uploadFileListPath"
-                     :key="item.id"> {{ item.name }}
+                  show-file-list
-                    <i
+                  :file-list="fileInfoList"
-                      title="下载"
+                  name="file"
-                      @click="downloadFile(item.id)"
+                  accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
-                      class="icon-download"
+                  :on-remove="delFileInfo"
-                      v-btn-permission="''"
+                  :on-success="uploadBackSuccess"
-                    />
+                  :before-upload="beforeUpload"
-                    <i
+                  :on-preview="handleOnPreview"
-                      title="下载带水印"
+                >
-                      @click="downloadFileByWater(item.id, item.name)"
+                  <el-button class="common-button-default" size="mini">
-                      class="icon-download2"
+                    点击上传
-                      v-btn-permission="''"
+                  </el-button>
-                    />
+                </el-upload>
-                  </p>
-                </div>
-                <div v-else>
-                  暂无数据
-                </div>
               </el-form-item>
             </el-col>
           </el-row>
@@ -479,7 +474,7 @@ export default {
         this.dataList = mes.form.dataList;
         this.commentText = mes.commentText;
         this.prcNum = mes.prcNum
-        this.fileIds = mes.form.fileId;
+        this.fileInfoList = mes.form.fileName;
         this.getFileInfo();
         this.processTable();
       });
@@ -652,13 +647,16 @@ export default {
     },
     // 删除上传的文件
     delFileInfo (file, fileList) {
-      this.fileInfoList = fileList
+      this.fileInfoList.forEach((item, index) => {
+        if (item.name === file.name || item.id === file.id ) {
+          this.fileInfoList.splice(index,1)
+        }
+      })
     },
     // 上传文件成功回调
     uploadBackSuccess (res, file, fileList) {
       if (res.ok) {
-        this.fileInfoList = fileList
+        this.fileInfoList.push(res.data)
-        this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
         this.$message.success('上传成功')
       } else {
         this.$message.error(res.message)
@@ -666,8 +664,38 @@ export default {
       }
     },
     //上传之前的钩子
-    beforeUpload () {
+    //上传之前的钩子
-
+    beforeUpload (file) {
+      var filename = file.name;
+      // this.listForm.fileName = this.listForm.fileName + ',' + file.name
+      var index1 = filename.lastIndexOf(".");
+      var index2 = filename.length;
+      var fileSuffix = filename.substring(index1, index2);
+      //把后缀转大写
+      if (fileSuffix !== undefined && fileSuffix !== null) {
+        fileSuffix = fileSuffix.toUpperCase();
+      }
+      // 判断上传文件格式
+      if (fileSuffix === ".PDF" || fileSuffix === ".DOC" || fileSuffix === ".DOCX" || fileSuffix === ".PPT"
+        || fileSuffix === ".PPTX" || fileSuffix === ".XLS" || fileSuffix === ".XLSX"
+        || fileSuffix === ".PNG" || fileSuffix === ".JPG" || fileSuffix === ".JPEG") {
+        return true;
+      } else {
+        this.$message.error("文件" + file.name + "格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件");
+        return false;
+      }
+      // 判断文件上传大小
+      if (file.size / 1024 / 1024 > 300) {
+        this.$message.warning("文件" + file.name + "大小不能超过300M");
+        return false;
+      }
+      return true;
+    },
+    handleOnPreview(file) {
+      let attId = file.id
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      }
     },
     //保存事件
     handleSave() {

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

@@ -50,23 +50,20 @@
               </el-form-item>
               <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
                 <div>
-                  <p>
+                  <el-upload
-                    {{ listForm.fileName }}
+                    :action="uploadFileListPath"
-                    <el-upload
+                    show-file-list
-                      :action="uploadFileListPath"
+                    :file-list="fileInfoList"
-                      show-file-list
+                    name="file"
-                      :file-list="fileInfoList"
+                    accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
-                      name="file"
+                    :on-remove="delFileInfo"
-                      accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
+                    :on-success="uploadBackSuccess"
-                      :on-remove="delFileInfo"
+                    :before-upload="beforeUpload"
-                      :on-success="uploadBackSuccess"
+                  >
-                      :before-upload="beforeUpload"
+                    <el-button class="common-button-default" size="mini">
-                    >
+                      点击上传
-                      <el-button class="common-button-default" size="mini">
+                    </el-button>
-                        点击上传
+                  </el-upload>
-                      </el-button>
-                    </el-upload>
-                  </p>
                 </div>
               </el-form-item>
               <el-form-item label="会签" prop="sign" class="add-form-item form-item-disabled">
@@ -108,7 +105,8 @@
             label="标准号">
             <template slot-scope="scope">
               <a v-if="scope.row.standYear" class="table-jump"
-                 @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber
+                 @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                  scope.row.standNumber
                 }}-{{ scope.row.standYear }}</a>
               <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
                 {{ scope.row.standNumber }}</a>
@@ -211,20 +209,20 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-<!--            <el-timeline-item timestamp="选择会签责任人,填写意见" placement="top"-->
+            <!--            <el-timeline-item timestamp="选择会签责任人,填写意见" placement="top"-->
-<!--                              :color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '2'">-->
+            <!--                              :color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '2'">-->
-<!--              <el-card>-->
+            <!--              <el-card>-->
-<!--                <el-form-item prop="dockUserName2" style="margin-bottom: 0">-->
+            <!--                <el-form-item prop="dockUserName2" style="margin-bottom: 0">-->
-<!--                  <h4>会签人</h4>-->
+            <!--                  <h4>会签人</h4>-->
-<!--                  <div style="margin-top: 10px;width: 300px;">-->
+            <!--                  <div style="margin-top: 10px;width: 300px;">-->
-<!--                    <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>-->
+            <!--                    <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>-->
-<!--                    <el-input v-model="roleForm.dockUserName" placeholder="选择会签责任人"-->
+            <!--                    <el-input v-model="roleForm.dockUserName" placeholder="选择会签责任人"-->
-<!--                              @click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)">-->
+            <!--                              @click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)">-->
-<!--                    </el-input>-->
+            <!--                    </el-input>-->
-<!--                  </div>-->
+            <!--                  </div>-->
-<!--                </el-form-item>-->
+            <!--                </el-form-item>-->
-<!--              </el-card>-->
+            <!--              </el-card>-->
-<!--            </el-timeline-item>-->
+            <!--            </el-timeline-item>-->
             <el-timeline-item timestamp="根据会签意见修订" placement="top"
                               :color="roleForm.ministerUser ? '#66b1ff' : ''" v-if="signFlag === '1'">
               <el-card>
@@ -304,6 +302,8 @@
               height="100%"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
+              @row-click="rowClick"
+              @select="select"
               @selection-change="selectListChange"
               ref="selection"
             >
@@ -324,7 +324,8 @@
               >
                 <template slot-scope="scope">
                   <a class="table-jump" @click.stop="showTable(scope.row)">{{
-                      scope.row.detailedListName }}</a>
+                      scope.row.detailedListName
+                    }}</a>
                 </template>
               </el-table-column>
               <el-table-column
@@ -343,7 +344,8 @@
                 align="center">
                 <template slot-scope="scope">
             <span
-              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
+              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{
+                scope.row.detailedListVision
               }}</span>
                 </template>
               </el-table-column>
@@ -371,6 +373,8 @@
               height="100%"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
+              @row-click="rowClick"
+              @select="select"
               @selection-change="selectListChange"
               ref="selection"
             >
@@ -391,7 +395,8 @@
               >
                 <template slot-scope="scope">
                   <a class="table-jump" @click.stop="showTable(scope.row)">{{
-                      scope.row.detailedListName }}</a>
+                      scope.row.detailedListName
+                    }}</a>
                 </template>
               </el-table-column>
               <el-table-column
@@ -410,7 +415,8 @@
                 align="center">
                 <template slot-scope="scope">
             <span
-              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
+              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{
+                scope.row.detailedListVision
               }}</span>
                 </template>
               </el-table-column>
@@ -419,9 +425,9 @@
                 label="更新时间"
                 sortable
                 align="center">
-                  <template slot-scope="scope">
+                <template slot-scope="scope">
-                    <span>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD") : "" }}</span>
+                  <span>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD") : "" }}</span>
-                  </template>
+                </template>
               </el-table-column>
               <el-table-column
                 prop="updatePeople"
@@ -438,6 +444,8 @@
               height="100%"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
+              @row-click="rowClick"
+              @select="select"
               @selection-change="selectListChange"
               ref="selection"
             >
@@ -458,7 +466,8 @@
               >
                 <template slot-scope="scope">
                   <a class="table-jump" @click.stop="showTable(scope.row)">{{
-                      scope.row.detailedListName }}</a>
+                      scope.row.detailedListName
+                    }}</a>
                 </template>
               </el-table-column>
               <el-table-column
@@ -477,7 +486,8 @@
                 align="center">
                 <template slot-scope="scope">
             <span
-              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
+              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{
+                scope.row.detailedListVision
               }}</span>
                 </template>
               </el-table-column>
@@ -593,7 +603,8 @@
                       scope.row.standNumber
                     }}-{{ scope.row.standYear }}</a>
                   <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
-                      scope.row.standSortShow }}
+                      scope.row.standSortShow
+                    }}
                     {{ scope.row.standNumber }}</a>
                 </template>
               </el-table-column>
@@ -705,7 +716,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { saveTaskFirst } from "api/process";
+import {saveTaskFirst} from "api/process";
 import seeDatalis from "@/pages/localTool/standContrast/pages/seeDatalis";
 
 export default {
@@ -755,21 +766,21 @@ export default {
       },
       formRules: {
         listType: [
-          { required: true, message: "请选择清单类型", trigger: "change" }
+          {required: true, message: "请选择清单类型", trigger: "change"}
         ],
         listName: [
-          { required: true, message: "请填写清单名称", trigger: "change" }
+          {required: true, message: "请填写清单名称", trigger: "change"}
         ]
       },
       roleFormRules: {
         dockUserName: [
-          { required: true, message: "请选择会签责任人", trigger: "change" }
+          {required: true, message: "请选择会签责任人", trigger: "change"}
         ],
         ministerUserName: [
-          { required: true, message: "请选择修订责任人", trigger: "change" }
+          {required: true, message: "请选择修订责任人", trigger: "change"}
         ],
         directorUserName: [
-          { required: true, message: "请选择审批责任人", trigger: "change" }
+          {required: true, message: "请选择审批责任人", trigger: "change"}
         ]
       },
       dataList: [],//清单里的标准数据
@@ -913,14 +924,14 @@ export default {
           _this: this
         }, res => {
           this.sarAccessListDatas = res.data.records;
-          this.sarAccessListDatas.forEach(item =>{
+          this.sarAccessListDatas.forEach(item => {
             // 适用车型转换
             if (item.carType !== null) {
               let k = (item.carType || "").split(',')
               for (let i in this.energyKindOptions) {
-                for (let m = 0; m< k.length; m++) {
+                for (let m = 0; m < k.length; m++) {
                   if (this.energyKindOptions[i].value === k[m]) {
-                    k[m]  = this.energyKindOptions[i].label
+                    k[m] = this.energyKindOptions[i].label
                   }
                   item.carType = k.join(',')
                 }
@@ -984,12 +995,12 @@ export default {
       }, res => {
         this.standardData = res.data.list;
         this.standardData.forEach(item => {
-          if(item.attrInfoMap === null){
+          if (item.attrInfoMap === null) {
-              this.$set(item, "ZCCSSRQ", '');
+            this.$set(item, "ZCCSSRQ", '');
-              this.$set(item, "XCXSSRQ", '');
+            this.$set(item, "XCXSSRQ", '');
-          }else{
+          } else {
-              this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
+            this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
-              this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
+            this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
           }
         })
         this.totalNo = res.data.count;
@@ -1036,6 +1047,7 @@ export default {
     //保存事件
     handleSave() {
       this.saveLoading = true;
+      this.listForm.fileName = this.fileInfoList
       let _formData = new FormData();
       _formData.append("id", this.bpnId || "");
       _formData.append("createUser", this.$store.getters.userInfo.userId);
@@ -1061,13 +1073,14 @@ export default {
         this.$message.warning("标准不能为空");
       } else {
         this.listForm.commentText = this.commentText
+        this.listForm.fileName = this.fileInfoList
         var json = Object.assign(this.listForm, this.roleForm);
         this.$refs["qdfbForm"].validate((valid) => {
           if (valid) {
             this.$refs["Form"].validate((valid) => {
               if (valid) {
                 this.isSubmit = true
-                this.$http.get("lawss/activiti/startProcess", { type: "4" }, {
+                this.$http.get("lawss/activiti/startProcess", {type: "4"}, {
                   _this: this
                 }, res => {
                   if (res.ok) {
@@ -1098,14 +1111,11 @@ export default {
     },
     // 删除上传的文件
     delFileInfo(file, fileList) {
-      let middle = [];
+      this.fileInfoList.forEach((item, index) => {
-      let files = [];
+        if (item.name === file.name || item.id === file.id ) {
-      fileList.forEach(item => {
+          this.fileInfoList.splice(index,1)
-        middle.push(item.name);
+        }
-        files.push(item.response.data.id);
+      })
-      });
-      this.fileListName = middle;
-      this.fileIds = files;
     },
     fileUpload() {
       this.fileMadel = true;
@@ -1113,24 +1123,7 @@ export default {
     // 上传文件成功回调
     uploadBackSuccess(res, file, fileList) {
       if (res.ok) {
-        let middle = [];
+        this.fileInfoList.push(res.data)
-        fileList.forEach(item => {
-          middle.push(item.name);
-        });
-        this.fileListName = middle;
-        this.fileIds.push(file.response.data.id);
-        // this.listForm.fileName =  this.fileListName.join(',');
-        // this.listForm.fileId = this.fileIds.join(',');
-        if (this.listForm.fileName === null || this.listForm.fileName === undefined || this.listForm.fileName === '') {
-          this.listForm.fileName = this.fileListName.join(",");
-        } else {
-          this.listForm.fileName = this.listForm.fileName + "," + this.fileListName.join(",");
-        }
-        if (this.listForm.fileId === null || this.listForm.fileId === undefined || this.listForm.fileName === '') {
-          this.listForm.fileId = this.fileIds.join(",");
-        } else {
-          this.listForm.fileId = this.listForm.fileId + "," + this.fileIds.join(",");
-        }
         this.$message.success("上传成功");
       } else {
         this.$message.error(res.message);
@@ -1262,30 +1255,39 @@ export default {
     //选择清单确定事件
     OkDrawer() {
       if (this.selectedList.length === 1) {
-        let deposit = new Map();
+        this.listForm.standId = this.selectedList[0].id;
-        this.sarAccessListDatas.forEach(item => {
+        this.listForm.listName = this.selectedList[0].detailedListName;
-          deposit.set(item.id, item);
+        this.listForm.descriptionList = this.selectedList[0].remark;
-        });
+        // 将查询出的文件名字和id组合成数组
-        let bringData = [];
+        if(this.selectedList[0].fileName !== null) {
-        for (let i = 0; i < this.selectedList.length; i++) {
+          let textName = this.selectedList[0].fileName.split(',').map(item => {
-          bringData.push(deposit.get(this.selectedList[i]));
+            return {
-        }
+              name: item
-        this.listForm.standId = bringData[0].id;
+            }
-        this.listForm.listName = bringData[0].detailedListName;
+          })
-        this.listForm.descriptionList = bringData[0].remark;
+          let textId = this.selectedList[0].fileIds.split(',').map(item => {
-        this.listForm.fileId = bringData[0].fileIds;
+            return {
-        if(bringData[0].fileName === null ){
+              id: item
-          this.listForm.fileName = ''
+            }
+          })
+          textName.forEach(item => {
+            this.$set(item, 'id', '')
+          })
+          for (let i = 0; i< textName.length; i++) {
+            textName[i].id = textId[i].id
+          }
+          this.fileInfoList = textName
         } else {
-          this.listForm.fileName = bringData[0].fileName;
+          this.fileInfoList = []
         }
         this.ListModel = false;
+
         this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById",
-          { id: bringData[0].id, page: this.page, Size: this.pageSize }, {
+          { id: this.selectedList[0].id, page: this.page, Size: this.pageSize }, {
             _this: this
           }, res => {
-            if (res.data.records == null) {
+            if (res.data === null) {
-              res.data.records = [];
+              this.dataList = [];
             }
             this.dataList = res.data.records;
             this.dataList.forEach(item => {
@@ -1305,8 +1307,6 @@ export default {
             this.listForm.inforlist = formId.join(",");
           }, e => {
           });
-      } else if (this.selectedList.length > 1) {
-        this.$message.warning("只能选择一条数据进行带入");
       } else {
         this.$message.warning("请选择一条数据进行带入");
       }
@@ -1315,7 +1315,7 @@ export default {
     selectListChange(data) {
       this.selectedList = [];
       for (let i = 0; i < data.length; i++) {
-        this.selectedList.push(data[i].id);
+        this.selectedList.push(data[0]);
       }
     },
     //标准表格选择框改变
@@ -1325,10 +1325,38 @@ export default {
         this.selectList.push(data[i].id);
       }
     },
+    select(selection, row) {
+      // 清除 所有勾选项
+      this.$refs.selection.clearSelection()
+      // 当表格数据都没有被勾选的时候 就返回
+      // 主要用于将当前勾选的表格状态清除
+      if(selection.length === 0) return
+      this.$refs.selection.toggleRowSelection(row, true)
+    },
     //添加标准select的改变
     selectThree(data) {
       this.standList = data;
     },
+    // 表格某一行的单击事件
+    rowClick(row, column) {
+      const selectData = this.selectList
+      this.$refs.selection.clearSelection()
+      if( selectData.length === 1 ) {
+        selectData.forEach(item => {
+          // 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
+          if (item === row) {
+            this.$refs.selection.toggleRowSelection(row, false);
+          }
+          // 不然就让当前的一行勾选
+          else {
+            this.$refs.selection.toggleRowSelection(row, true);
+          }
+        })
+      }
+      else {
+        this.$refs.selection.toggleRowSelection(row, true);
+      }
+    },
     choiceZRR(type, title, id) {
       this.nodeList = [];
       this.nodeList.push(id);
@@ -1349,7 +1377,6 @@ export default {
       });
     },
     pageChange(page) {
-      console.log(page);
       this.page = page;
       this.selectionList();
     },

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

@@ -315,7 +315,6 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
-          console.log(res.mesg);
           if (res) {
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);
@@ -330,15 +329,16 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
-        console.log(this.listForm.fileName);
         this.listForm.prcNum = this.prcNum;
         this.listForm.prcName = this.prcName;
         this.listForm["id"] = item.id;
         this.dataList = item.dataList;
         this.listForm.jlUserId = item.jlUserId;
         this.listForm.zrUserId = item.zrUserId;
-        this.fileIds = item.fileId;
+        item.fileName.forEach(itemId => {
-        this.getFileInfo();
+          this.fileIds = itemId.id
+          this.getFileInfo();
+        });
       });
     },
     // 请求上传的文件信息

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

@@ -52,26 +52,21 @@
                 ></el-input>
               </el-form-item>
               <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
-                <div class="file-box" v-if="fileList.length > 0">
+                <el-upload
-                  <p v-for="item in fileList"
+                  :action="uploadFileListPath"
-                     :key="item.id"> {{ item.name }}
+                  show-file-list
-                    <i
+                  :file-list="fileInfoList"
-                      title="下载"
+                  name="file"
-                      @click="downloadFile(item.id)"
+                  accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
-                      class="icon-download"
+                  :on-remove="delFileInfo"
-                      v-btn-permission="''"
+                  :on-success="uploadBackSuccess"
-                    />
+                  :before-upload="beforeUpload"
-                    <i
+                  :on-preview="handleOnPreview"
-                      title="下载带水印"
+                >
-                      @click="downloadFileByWater(item.id, item.name)"
+                  <el-button class="common-button-default" size="mini">
-                      class="icon-download2"
+                    点击上传
-                      v-btn-permission="''"
+                  </el-button>
-                    />
+                </el-upload>
-                  </p>
-                </div>
-                <div v-else>
-                  暂无数据
-                </div>
               </el-form-item>
             </el-col>
           </el-row>
@@ -611,7 +606,7 @@ export default {
       }
     },
     // 请求上传的文件信息
-    getFileInfo() {
+   /* getFileInfo() {
       this.$http.get("att/attFile/getMultiFileInfos", {
         fileIds: this.fileIds
       }, {
@@ -630,7 +625,7 @@ export default {
         });
       }, e => {
       });
-    },
+    },*/
     /**
      * @Description: 点击下载
      */
@@ -655,13 +650,16 @@ export default {
     },
     // 删除上传的文件
     delFileInfo (file, fileList) {
-      this.fileInfoList = fileList
+      this.fileInfoList.forEach((item, index) => {
+        if (item.name === file.name || item.id === file.id ) {
+          this.fileInfoList.splice(index,1)
+        }
+      })
     },
     // 上传文件成功回调
     uploadBackSuccess (res, file, fileList) {
       if (res.ok) {
-        this.fileInfoList = fileList
+        this.fileInfoList.push(res.data)
-        this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
         this.$message.success('上传成功')
       } else {
         this.$message.error(res.message)
@@ -669,8 +667,37 @@ export default {
       }
     },
     //上传之前的钩子
-    beforeUpload () {
+    beforeUpload (file) {
-
+      var filename = file.name;
+      // this.listForm.fileName = this.listForm.fileName + ',' + file.name
+      var index1 = filename.lastIndexOf(".");
+      var index2 = filename.length;
+      var fileSuffix = filename.substring(index1, index2);
+      //把后缀转大写
+      if (fileSuffix !== undefined && fileSuffix !== null) {
+        fileSuffix = fileSuffix.toUpperCase();
+      }
+      // 判断上传文件格式
+      if (fileSuffix === ".PDF" || fileSuffix === ".DOC" || fileSuffix === ".DOCX" || fileSuffix === ".PPT"
+        || fileSuffix === ".PPTX" || fileSuffix === ".XLS" || fileSuffix === ".XLSX"
+        || fileSuffix === ".PNG" || fileSuffix === ".JPG" || fileSuffix === ".JPEG") {
+        return true;
+      } else {
+        this.$message.error("文件" + file.name + "格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件");
+        return false;
+      }
+      // 判断文件上传大小
+      if (file.size / 1024 / 1024 > 300) {
+        this.$message.warning("文件" + file.name + "大小不能超过300M");
+        return false;
+      }
+      return true;
+    },
+    handleOnPreview(file) {
+      let attId = file.id
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      }
     },
     getData() {
       return new Promise((resolve, reject) => {
@@ -701,14 +728,12 @@ export default {
           this.listForm.applyUpdUserId = item.applyUpdUserId
           this.listForm.jlUserId = item.jlUserId
           this.listForm.zrUserId = item.zrUserId
-          this.fileIds = item.fileId;
+          this.fileInfoList = item.fileName
-          this.getFileInfo();
          } else {
           this.listForm = item.form
           this.dataList = item.form.dataList
           this.listForm.dataList = item.form.dataList
-          this.fileIds = item.form.fileId;
+          this.fileInfoList = item.form.fileName
-          this.getFileInfo();
         }
       })
     },

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

@@ -37,27 +37,6 @@
                   clearable
                 ></el-input>
               </el-form-item>
-<!--              <el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">-->
-<!--                <div class="file-box" v-if="listForm.model">-->
-<!--                  <p> {{ listForm.modelName }}-->
-<!--                    <i-->
-<!--                      title="下载"-->
-<!--                      @click="downloadFile(listForm.model)"-->
-<!--                      class="icon-download"-->
-<!--                      v-btn-permission="''"-->
-<!--                    />-->
-<!--                    <i-->
-<!--                      title="下载带水印"-->
-<!--                      @click="downloadFileByWater(listForm.model,listForm.modelName)"-->
-<!--                      class="icon-download2"-->
-<!--                      v-btn-permission="''"-->
-<!--                    />-->
-<!--                  </p>-->
-<!--                </div>-->
-<!--                <div v-else>-->
-<!--                  暂无数据-->
-<!--                </div>-->
-<!--              </el-form-item>-->
               <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
                 <div class="file-box" v-if="fileList.length > 0">
                   <p v-for="item in fileList"
@@ -379,9 +358,10 @@ export default {
         this.listForm.applyUpdUserId = item.applyUpdUserId;
         this.listForm.jlUserId = item.jlUserId;
         this.listForm.zrUserId = item.zrUserId;
-        this.fileIds = item.fileId;
+        item.fileName.forEach(itemId => {
-        console.log(this.fileIds);
+          this.fileIds = itemId.id
-        this.getFileInfo();
+          this.getFileInfo();
+        })
       });
     },
     // 请求上传的文件信息
@@ -427,7 +407,7 @@ export default {
         }
       }
     },
-    //驳回事件
+    // 驳回事件
     beforeBack() {
       if(!this.commentText){
         this.$message.warning('请填写审批意见')

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

@@ -80,15 +80,29 @@
                             <el-col :span="12">
 
 
-                              <el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
+<!--                              <el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">-->
-                                <el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区">
+<!--                                <el-select :popper-append-to-body="false" v-model="form.country"  placeholder="国家/地区">-->
+<!--                                  <el-option-->
+<!--                                      v-for="item in countryOptions"-->
+<!--                                      placeholder="请选择"-->
+<!--                                      :key="item.value"-->
+<!--                                      :value="item.value"-->
+<!--                                      :label="item.label"-->
+<!--                                  ></el-option>-->
+<!--                                </el-select>-->
+<!--                              </el-form-item>-->
+
+
+                              <el-form-item v-if="form.standInData=='1'"label="国家/地区" prop="" label-width="150px" class="add-form-item">
+                                <el-select v-model="form.country" multiple filterable clearable>
                                   <el-option
                                       v-for="item in countryOptions"
                                       placeholder="请选择"
                                       :key="item.value"
                                       :value="item.value"
                                       :label="item.label"
-                                  ></el-option>
+                                  >
+                                  </el-option>
                                 </el-select>
                               </el-form-item>
 
@@ -892,6 +906,7 @@
                 </el-collapse-item>
             </el-collapse>
         </div>
+<!--        保存||提交-->
         <ProcessFooter
                 v-show="verifySarStandard"
                 show-save
@@ -1354,6 +1369,7 @@
                 fileUrl: 'api/att/attFile/upload',
                 fileMadel: false,
                 fileType: '',
+                countryArr:'',
                 form: {
                     // 基础信息
                     textStatus: '', // 文本状态
@@ -1509,6 +1525,20 @@
             }
         },
         watch:{
+          'form.country': {
+            handler (val) {
+              console.log("val")
+              if (val !== '' && val !== null && typeof (val) !== 'undefined') {
+                if (val instanceof Array) {
+                  this.countryArr = val.join(",");
+                } else {
+                  this.countryArr = val
+                }
+              } else if (val === '') {
+                this.countryArr = []
+              }
+            }
+          },
           filterText(val) {
             this.$refs.tree.filter(val);
           },
@@ -2252,6 +2282,11 @@
             },
             //保存
             handleSave() {
+              this.form.country=this.countryArr;
+              // if(item.country !== undefined && item.country !== null){
+              //   this.sarStandardsInfoEO.country = item.country.split(",");
+              // }
+
                 this.saveLoading = true
                 let _formData = new FormData()
                 // _formData.append('id', this.bpnId)
@@ -2280,6 +2315,7 @@
                 })
             },
             handleSubmit() {
+              this.form.country=this.countryArr;
                 this.$refs['form'].validate((valid) => {
                     if (valid) {
                         this.$refs['userForm'].validate((valid) => {

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

@@ -33,7 +33,7 @@
 
 
                               <el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" disabled>
+                                <el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" multiple disabled>
                                   <el-option
                                       v-for="item in countryOptions"
                                       placeholder="请选择"
@@ -680,6 +680,7 @@
             <loading :loading="loading">流程列表加载中</loading>
           </div>
         </div>
+<!--      提交-->
         <ProcessFooter
                 :show-save="false"
                 show-submit
@@ -1006,6 +1007,9 @@
                     this.defaultCheckedKeys3 = [this.form.dybxh]
                     this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
                     this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
+                  if( this.form.country !== undefined &&   this.form.country !== null &&   this.form.country !== ''){
+                    this.form.country=this.form.country.split(",");
+                  }
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
@@ -1030,6 +1034,16 @@
             },
             handleSave() {},
             handleSubmit() {
+              const val= this.form.country;
+              if (val !== '' && val !== null && typeof (val) !== 'undefined') {
+                if (val instanceof Array) {
+                  this.form.country = val.join(",");
+                } else {
+                  this.form.country = val
+                }
+              } else if (val === '') {
+                this.form.country = []
+              }
               this.$refs['formTongGuo'].validate((valid) => {
                     if (valid) {
                       this.isSubmit = true

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

@@ -33,7 +33,7 @@
 
 
                 <el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
-                  <el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" disabled>
+                  <el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" multiple disabled>
                     <el-option
                         v-for="item in countryOptions"
                         placeholder="请选择"
@@ -956,6 +956,8 @@ export default {
     getFormFieldList (item) {
       this.$nextTick(() => {
         this.form = JSON.parse(JSON.stringify(item))
+        console.log("this.form");
+        console.log(this.form);
         this.defaultCheckedKeys = [this.form.standSystem]
         this.defaultCheckedKeys1 = [this.form.cycvppsbm]
         this.defaultCheckedKeys2 = [this.form.kccvppsbm]
@@ -964,6 +966,10 @@ export default {
         this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
         this.form.prcNum = this.prcNum
         this.form.prcName = this.prcName
+        if( this.form.country !== undefined &&   this.form.country !== null &&   this.form.country !== ''){
+          this.form.country=this.form.country.split(",");
+        }
+
         this.form['id'] = item.id
         this.$forceUpdate()
       })

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

@@ -32,7 +32,7 @@
                   </el-radio-group>
                 </el-form-item>
                 <el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
-                  <el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区">
+                  <el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" multiple>
                     <el-option
                         v-for="item in countryOptions"
                         placeholder="请选择"
@@ -912,6 +912,7 @@
         <loading :loading="loading">流程列表加载中</loading>
       </div>
     </div>
+<!--    提交-->
     <ProcessFooter
         show-save
         show-submit
@@ -1060,6 +1061,7 @@ export default {
   },
   data () {
     return {
+      countryArr:'',
       activeName:'1',
       // 当前流程类型(1待办/2已办)
       processType: 1,
@@ -1150,6 +1152,10 @@ export default {
           { required: true, message: '请输入标准名称', trigger: 'blur' },
           { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
         ],
+        standEnName: [
+          { required: true, message: '请输入标准英文名称', trigger: 'blur' },
+          { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
+        ],
         standNature: [
           { required: true, message: '请选择标准性质', trigger: 'change' }
         ],
@@ -1689,6 +1695,7 @@ export default {
       this.active = name
     },
     handleSave() {
+      this.form.country=this.countryArr;
       this.saveLoading = true
       let _formData = new FormData()
       // _formData.append('id', this.bpnId)
@@ -1710,6 +1717,7 @@ export default {
       })
     },
     handleSubmit() {
+      this.form.country=this.countryArr;
       this.$refs['form'].validate((valid) => {
           if (valid) {
             this.isSubmit = true
@@ -1791,6 +1799,20 @@ export default {
     this.modelFunc()
   },
   watch:{
+
+    'form.country': {
+      handler (val) {
+        if (val !== '' && val !== null && typeof (val) !== 'undefined') {
+          if (val instanceof Array) {
+            this.countryArr = val.join(",");
+          } else {
+            this.countryArr = val
+          }
+        } else if (val === '') {
+          this.countryArr = []
+        }
+      }
+    },
     form(val){
       if(this.form){
 

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

@@ -96,17 +96,40 @@
                     </el-table-column>
                     <el-table-column
                             prop="chapterName"
-                            label="章节名称">
+                            label="章节名称"
+                            width="170px">
                         <template slot-scope="scope">
                             <el-input style="margin: 10px 0;" v-model="scope.row.chapterName"></el-input>
                         </template>
                     </el-table-column>
                     <el-table-column
                             prop="commentText"
+                            align="center"
                             label="修改意见内容（包括理由或依据）">
-                        <template slot-scope="scope">
+                        <el-table-column
-                            <el-input style="margin: 10px 0;" v-model="scope.row.commentText"></el-input>
+                                prop="name"
-                        </template>
+                                align="center"
+                                label="修改前">
+                            <template slot-scope="scope">
+                                <el-input style="margin: 10px 0;" v-model="scope.row.oldText"></el-input>
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                                prop="name"
+                                align="center"
+                                label="修改后">
+                            <template slot-scope="scope">
+                                <el-input style="margin: 10px 0;" v-model="scope.row.newText"></el-input>
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                                prop="name"
+                                align="center"
+                                label="修改理由">
+                            <template slot-scope="scope">
+                                <el-input style="margin: 10px 0;" v-model="scope.row.reason"></el-input>
+                            </template>
+                        </el-table-column>
                     </el-table-column>
                 </el-table>
             </div>
@@ -288,6 +311,9 @@
                     chapterNumber: '',
                     chapterName: '',
                     commentText: '',
+                    oldText: '',
+                    newText: '',
+                    reason: '',
                     id: id,
                     responUserName: this.$store.getters.userInfo.userName,
                     responUser: this.$store.getters.userInfo.userId,
@@ -305,7 +331,7 @@
                 } else {
                     var a = 0
                     var b = 0
-                    var c = 0
+                    // var c = 0
                     for (let s1 = 0; s1 < this.data.length; s1++) {
                         if (!this.data[s1].chapterNumber) {
                             a++
@@ -313,17 +339,19 @@
                         if (!this.data[s1].chapterName) {
                             b++
                         }
-                        if (!this.data[s1].commentText) {
+                        // if (!this.data[s1].commentText) {
-                            c++
+                        //     c++
-                        }
+                        // }
                     }
                     if (a > 0) {
                         this.$message.warning('请输入章节编号')
                     } else if (b > 0) {
                         this.$message.warning('请输入章节名称')
-                    } else if (c > 0) {
+                    }
-                        this.$message.warning('请输入意见内容')
+                    // else if (c > 0) {
-                    } else {
+                    //     this.$message.warning('请输入意见内容')
+                    // }
+                    else {
                         this.isSubmit = true
                         var json = this.json
                         json.commentText = this.commentText

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

@@ -80,8 +80,24 @@
                             label="章节名称">
                     </el-table-column>
                     <el-table-column
+                            align="center"
                             prop="commentText"
                             label="修改意见内容（包括理由或依据）">
+                        <el-table-column
+                                prop="oldText"
+                                align="center"
+                                label="修改前">
+                        </el-table-column>
+                        <el-table-column
+                                prop="newText"
+                                align="center"
+                                label="修改后">
+                        </el-table-column>
+                        <el-table-column
+                                prop="reason"
+                                align="center"
+                                label="修改理由">
+                        </el-table-column>
                     </el-table-column>
                     <el-table-column
                             prop="department"

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

@@ -81,15 +81,47 @@
                     </el-table-column>
                     <el-table-column
                             prop="commentText"
+                            align="center"
                             label="修改意见内容（包括理由或依据）">
-                        <template slot-scope="scope">
+                        <el-table-column
-                            <div v-if="scope.row.state == '2'">
+                                prop="name"
-                                <el-input style="margin: 10px 0;" v-model="scope.row.commentText"></el-input>
+                                align="center"
-                            </div>
+                                label="修改前">
-                            <div v-else>
+                            <template slot-scope="scope">
-                                {{ scope.row.commentText }}
+                                <div v-if="scope.row.state == '2'">
-                            </div>
+                                    <el-input style="margin: 10px 0;" v-model="scope.row.oldText"></el-input>
-                        </template>
+                                </div>
+                                <div v-else>
+                                    {{ scope.row.oldText }}
+                                </div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                                prop="name"
+                                align="center"
+                                label="修改后">
+                            <template slot-scope="scope">
+                                <div v-if="scope.row.state == '2'">
+                                    <el-input style="margin: 10px 0;" v-model="scope.row.newText"></el-input>
+                                </div>
+                                <div v-else>
+                                    {{ scope.row.newText }}
+                                </div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                                prop="name"
+                                align="center"
+                                label="修改理由">
+                            <template slot-scope="scope">
+                                <div v-if="scope.row.state == '2'">
+                                    <el-input style="margin: 10px 0;" v-model="scope.row.reason"></el-input>
+                                </div>
+                                <div v-else>
+                                    {{ scope.row.reason }}
+                                </div>
+                            </template>
+                        </el-table-column>
                     </el-table-column>
                     <el-table-column
                             prop="department"
@@ -273,7 +305,7 @@
                 } else {
                     var a = 0
                     var b = 0
-                    var c = 0
+                    // var c = 0
                     for (let s1 = 0; s1 < this.data.length; s1++) {
                         if (!this.data[s1].chapterNumber) {
                             a++
@@ -281,17 +313,19 @@
                         if (!this.data[s1].chapterName) {
                             b++
                         }
-                        if (!this.data[s1].commentText) {
+                        // if (!this.data[s1].commentText) {
-                            c++
+                        //     c++
-                        }
+                        // }
                     }
                     if (a > 0) {
                         this.$message.warning('请输入章节编号')
                     } else if (b > 0) {
                         this.$message.warning('请输入章节名称')
-                    } else if (c > 0) {
+                    }
-                        this.$message.warning('请输入意见内容')
+                    // else if (c > 0) {
-                    } else {
+                    //     this.$message.warning('请输入意见内容')
+                    // }
+                    else {
                         this.isSubmit = true
                         var json = this.json
                         json.oldinfo = this.oldData
@@ -320,6 +354,7 @@
                         this.form.cid = data.cid
                         this.form.endTime = data.endTime
                         this.form.cname = data.cname
+                        console.log(data);
                         this.oldData = JSON.parse(JSON.stringify(data.summaryList))
                         data.summaryList.forEach( item => {
                             if (item.state) {

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

@@ -91,7 +91,23 @@
                     </el-table-column>
                     <el-table-column
                             prop="commentText"
+                            align="center"
                             label="修改意见内容（包括理由或依据）">
+                        <el-table-column
+                                prop="oldText"
+                                align="center"
+                                label="修改前">
+                        </el-table-column>
+                        <el-table-column
+                                prop="newText"
+                                align="center"
+                                label="修改后">
+                        </el-table-column>
+                        <el-table-column
+                                prop="reason"
+                                align="center"
+                                label="修改理由">
+                        </el-table-column>
                     </el-table-column>
                     <el-table-column
                             prop="department"
@@ -294,43 +310,21 @@
                 if (this.data.length < 1) {
                     this.$message.warning('请输入征求意见搞')
                 } else {
-                    var a = 0
+                    this.isSubmit = true
-                    var b = 0
+                    var json = this.json
-                    var c = 0
+                    json.actionFlag = 0
-                    for (let s1 = 0; s1 < this.data.length; s1++) {
+                    json.commentText = this.commentText
-                        if (!this.data[s1].chapterNumber) {
+                    this.$http.post('lawss/activiti/completeTask', {
-                            a++
+                        json: JSON.stringify(json),
+                        taskId: this.taskIds,
+                        userId: this.$store.getters.userInfo.userId
+                    }, {}, res => {
+                        if (res.success) {
+                            this.$message.success('提交成功')
+                            this.$router.push('/processCenter')
                         }
-                        if (!this.data[s1].chapterName) {
+                        this.isSubmit = false
-                            b++
+                    })
-                        }
-                        if (!this.data[s1].commentText) {
-                            c++
-                        }
-                    }
-                    if (a > 0) {
-                        this.$message.warning('请输入章节编号')
-                    } else if (b > 0) {
-                        this.$message.warning('请输入章节名称')
-                    } else if (c > 0) {
-                        this.$message.warning('请输入意见内容')
-                    } else {
-                        this.isSubmit = true
-                        var json = this.json
-                        json.actionFlag = 0
-                        json.commentText = this.commentText
-                        this.$http.post('lawss/activiti/completeTask', {
-                            json: JSON.stringify(json),
-                            taskId: this.taskIds,
-                            userId: this.$store.getters.userInfo.userId
-                        }, {}, res => {
-                            if (res.success) {
-                                this.$message.success('提交成功')
-                                this.$router.push('/processCenter')
-                            }
-                            this.isSubmit = false
-                        })
-                    }
                 }
             },
             handleSubmitNo() {

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

@@ -90,8 +90,24 @@
                             label="章节名称">
                     </el-table-column>
                     <el-table-column
+                            align="center"
                             prop="commentText"
                             label="修改意见内容（包括理由或依据）">
+                        <el-table-column
+                                prop="oldText"
+                                align="center"
+                                label="修改前">
+                        </el-table-column>
+                        <el-table-column
+                                prop="newText"
+                                align="center"
+                                label="修改后">
+                        </el-table-column>
+                        <el-table-column
+                                prop="reason"
+                                align="center"
+                                label="修改理由">
+                        </el-table-column>
                     </el-table-column>
                     <el-table-column
                             prop="department"
@@ -294,43 +310,21 @@
                 if (this.data.length < 1) {
                     this.$message.warning('请输入征求意见搞')
                 } else {
-                    var a = 0
+                    this.isSubmit = true
-                    var b = 0
+                    var json = this.json
-                    var c = 0
+                    json.actionFlag = 0
-                    for (let s1 = 0; s1 < this.data.length; s1++) {
+                    json.commentText = this.commentText
-                        if (!this.data[s1].chapterNumber) {
+                    this.$http.post('lawss/activiti/completeTask', {
-                            a++
+                        json: JSON.stringify(json),
+                        taskId: this.taskIds,
+                        userId: this.$store.getters.userInfo.userId
+                    }, {}, res => {
+                        if (res.success) {
+                            this.$message.success('提交成功')
+                            this.$router.push('/processCenter')
                         }
-                        if (!this.data[s1].chapterName) {
+                        this.isSubmit = false
-                            b++
+                    })
-                        }
-                        if (!this.data[s1].commentText) {
-                            c++
-                        }
-                    }
-                    if (a > 0) {
-                        this.$message.warning('请输入章节编号')
-                    } else if (b > 0) {
-                        this.$message.warning('请输入章节名称')
-                    } else if (c > 0) {
-                        this.$message.warning('请输入意见内容')
-                    } else {
-                        this.isSubmit = true
-                        var json = this.json
-                        json.actionFlag = 0
-                        json.commentText = this.commentText
-                        this.$http.post('lawss/activiti/completeTask', {
-                            json: JSON.stringify(json),
-                            taskId: this.taskIds,
-                            userId: this.$store.getters.userInfo.userId
-                        }, {}, res => {
-                            if (res.success) {
-                                this.$message.success('提交成功')
-                                this.$router.push('/processCenter')
-                            }
-                            this.isSubmit = false
-                        })
-                    }
                 }
             },
             handleSubmitNo() {

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

@@ -91,7 +91,23 @@
                     </el-table-column>
                     <el-table-column
                             prop="commentText"
+                            align="center"
                             label="修改意见内容（包括理由或依据）">
+                        <el-table-column
+                                prop="oldText"
+                                align="center"
+                                label="修改前">
+                        </el-table-column>
+                        <el-table-column
+                                prop="newText"
+                                align="center"
+                                label="修改后">
+                        </el-table-column>
+                        <el-table-column
+                                prop="reason"
+                                align="center"
+                                label="修改理由">
+                        </el-table-column>
                     </el-table-column>
                     <el-table-column
                             prop="department"
@@ -294,43 +310,21 @@
                 if (this.data.length < 1) {
                     this.$message.warning('请输入征求意见搞')
                 } else {
-                    var a = 0
+                    this.isSubmit = true
-                    var b = 0
+                    var json = this.json
-                    var c = 0
+                    json.actionFlag = 0
-                    for (let s1 = 0; s1 < this.data.length; s1++) {
+                    json.commentText = this.commentText
-                        if (!this.data[s1].chapterNumber) {
+                    this.$http.post('lawss/activiti/completeTask', {
-                            a++
+                        json: JSON.stringify(json),
+                        taskId: this.taskIds,
+                        userId: this.$store.getters.userInfo.userId
+                    }, {}, res => {
+                        if (res.success) {
+                            this.$message.success('提交成功')
+                            this.$router.push('/processCenter')
                         }
-                        if (!this.data[s1].chapterName) {
+                        this.isSubmit = false
-                            b++
+                    })
-                        }
-                        if (!this.data[s1].commentText) {
-                            c++
-                        }
-                    }
-                    if (a > 0) {
-                        this.$message.warning('请输入章节编号')
-                    } else if (b > 0) {
-                        this.$message.warning('请输入章节名称')
-                    } else if (c > 0) {
-                        this.$message.warning('请输入意见内容')
-                    } else {
-                        this.isSubmit = true
-                        var json = this.json
-                        json.actionFlag = 0
-                        json.commentText = this.commentText
-                        this.$http.post('lawss/activiti/completeTask', {
-                            json: JSON.stringify(json),
-                            taskId: this.taskIds,
-                            userId: this.$store.getters.userInfo.userId
-                        }, {}, res => {
-                            if (res.success) {
-                                this.$message.success('提交成功')
-                                this.$router.push('/processCenter')
-                            }
-                            this.isSubmit = false
-                        })
-                    }
                 }
             },
             handleSubmitNo() {

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

@@ -90,8 +90,24 @@
                             label="章节名称">
                     </el-table-column>
                     <el-table-column
+                            align="center"
                             prop="commentText"
                             label="修改意见内容（包括理由或依据）">
+                        <el-table-column
+                                prop="oldText"
+                                align="center"
+                                label="修改前">
+                        </el-table-column>
+                        <el-table-column
+                                prop="newText"
+                                align="center"
+                                label="修改后">
+                        </el-table-column>
+                        <el-table-column
+                                prop="reason"
+                                align="center"
+                                label="修改理由">
+                        </el-table-column>
                     </el-table-column>
                     <el-table-column
                             prop="department"
@@ -294,43 +310,21 @@
                 if (this.data.length < 1) {
                     this.$message.warning('请输入征求意见搞')
                 } else {
-                    var a = 0
+                    this.isSubmit = true
-                    var b = 0
+                    var json = this.json
-                    var c = 0
+                    json.actionFlag = 0
-                    for (let s1 = 0; s1 < this.data.length; s1++) {
+                    json.commentText = this.commentText
-                        if (!this.data[s1].chapterNumber) {
+                    this.$http.post('lawss/activiti/completeTask', {
-                            a++
+                        json: JSON.stringify(json),
+                        taskId: this.taskIds,
+                        userId: this.$store.getters.userInfo.userId
+                    }, {}, res => {
+                        if (res.success) {
+                            this.$message.success('提交成功')
+                            this.$router.push('/processCenter')
                         }
-                        if (!this.data[s1].chapterName) {
+                        this.isSubmit = false
-                            b++
+                    })
-                        }
-                        if (!this.data[s1].commentText) {
-                            c++
-                        }
-                    }
-                    if (a > 0) {
-                        this.$message.warning('请输入章节编号')
-                    } else if (b > 0) {
-                        this.$message.warning('请输入章节名称')
-                    } else if (c > 0) {
-                        this.$message.warning('请输入意见内容')
-                    } else {
-                        this.isSubmit = true
-                        var json = this.json
-                        json.actionFlag = 0
-                        json.commentText = this.commentText
-                        this.$http.post('lawss/activiti/completeTask', {
-                            json: JSON.stringify(json),
-                            taskId: this.taskIds,
-                            userId: this.$store.getters.userInfo.userId
-                        }, {}, res => {
-                            if (res.success) {
-                                this.$message.success('提交成功')
-                                this.$router.push('/processCenter')
-                            }
-                            this.isSubmit = false
-                        })
-                    }
                 }
             },
             handleSubmitNo() {

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

@@ -31,7 +31,7 @@
             <el-table-column type="selection" width="55" align="center"/>
             <el-table-column prop="standSerialNumber" label="标准号" show-overflow-tooltip align="center">
               <template slot-scope="scope">
-                <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
+                <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
               </template>
             </el-table-column>
             <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
@@ -148,7 +148,7 @@
           <el-form :modal="queryUnqualidiedData" inline class="label-input-form">
             <el-form-item label="标准号/标准名称" class="search-item">
               <el-input
-                v-model="queryUnqualidiedData.standId"
+                v-model="queryUnqualidiedData.standSerialNumber"
                 placeholder="请输入"
                 clearable
                 :maxlength="100"></el-input>
@@ -210,9 +210,9 @@
           @selection-change="selectedChange"
         >
         <el-table-column type="selection" width="55" align="center"/>
-        <el-table-column prop="standId" align="center" show-overflow-tooltip label="标准号">
+        <el-table-column prop="standSerialNumber" align="center" show-overflow-tooltip label="标准号">
           <template slot-scope="scope">
-            <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
+            <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
           </template>
         </el-table-column>
         <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">

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

@@ -97,9 +97,9 @@
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '48px'}">
           <el-table-column type="selection" width="55" align="center"/>
-          <el-table-column prop="standId" show-overflow-tooltip label="标准号" align="center">
+          <el-table-column prop="standSerialNumber" show-overflow-tooltip label="标准号" align="center">
             <template slot-scope="scope">
-              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
+              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
             </template>
           </el-table-column>
           <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
@@ -248,6 +248,7 @@ export default {
       taskIds: this.$route.query.taskIds,
       pId: this.$route.query.prcId,
       nonSearch: {
+        standSerialNumber: '',
         standId: '', // 标准号/名称
         productName: '', // 项目名称
         responsibleUnit: '' // 责任部门
@@ -457,7 +458,7 @@ export default {
       this.modalshowflag = false
     },
     //查询按钮
-    getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
+    /*getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
         this.realList = this.dataList.filter(item => {
           let matchId = true; // 标准号 筛选
           let matchName = true; // 项目名称 筛选
@@ -479,7 +480,7 @@ export default {
           return matchId && matchName && matchUnit;
         })
         this.dataList = this.realList
-      },
+      },*/
     // 点击查看
     handlePreview (item) {
       let routeUrl = this.$router.resolve({
@@ -496,6 +497,7 @@ export default {
     clearAllSearch () {
       this.nonSearch = {
         standId: '',
+        standSerialNumber: '',
         productName: '',
         responsibleUnit: ''
       }

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

@@ -99,9 +99,9 @@
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '48px'}">
           <el-table-column type="selection" width="55" align="center"/>
-          <el-table-column prop="standId" show-overflow-tooltip label="标准号" align="center">
+          <el-table-column prop="standSerialNumber" show-overflow-tooltip label="标准号" align="center">
             <template slot-scope="scope">
-              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
+              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
             </template>
           </el-table-column>
           <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">

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

@@ -87,9 +87,9 @@
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '48px'}">
           <el-table-column type="selection" width="55" align="center"/>
-          <el-table-column prop="standId" align="center" show-overflow-tooltip label="标准号">
+          <el-table-column prop="standSerialNumber" align="center" show-overflow-tooltip label="标准号">
             <template slot-scope="scope">
-              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
+              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
             </template>
           </el-table-column>
           <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
@@ -385,7 +385,6 @@ export default {
       this.fileData = fileList
       this.fileTextList.forEach((item, index) => {
         if (item.name === file.name || item.id === file.id ) {
-          console.log()
           this.fileTextList.splice(index,1)
         }
       })

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

@@ -87,9 +87,9 @@
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '48px'}">
           <el-table-column type="selection" width="55" align="center"/>
-          <el-table-column prop="standId" align="center" show-overflow-tooltip label="标准号">
+          <el-table-column prop="standSerialNumber" align="center" show-overflow-tooltip label="标准号">
             <template slot-scope="scope">
-              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
+              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
             </template>
           </el-table-column>
           <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">

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

@@ -480,6 +480,7 @@ export default {
         this.projectId = this.selectedList[0].id;
         this.listForm.projectNumber = this.selectedList[0].projectNumber;
         this.listForm.projectName = this.selectedList[0].projectName;
+        this.listForm.productLine = this.selectedList[0].productLine;
         this.getStandData();
         this.projectModel = false;
       }

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

@@ -478,6 +478,7 @@ export default {
         this.projectId = this.selectedList[0].id;
         this.listForm.projectNumber = this.selectedList[0].projectNumber;
         this.listForm.projectName = this.selectedList[0].projectName;
+        this.listForm.productLine = this.selectedList[0].productLine;
         this.getStandData();
         this.projectModel = false;
       }

src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue

@@ -95,21 +95,21 @@
             label="条款名称">
           </el-table-column>
           <el-table-column
-            prop="xcxssrqgj"
+            prop="xcxssrq"
             width="200"
             align="center"
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="zccssrqgj"
+            prop="zccssrq"
             width="200"
             align="center"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue

@@ -95,12 +95,12 @@
             label="条款名称">
           </el-table-column>
           <el-table-column
-            prop="xcxssrqgj"
+            prop="xcxssrq"
             width="200"
             align="center"
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -109,7 +109,7 @@
             align="center"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue

@@ -95,21 +95,21 @@
             label="条款名称">
           </el-table-column>
           <el-table-column
-            prop="xcxssrqgj"
+            prop="xcxssrq"
             width="200"
             align="center"
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="zccssrqgj"
+            prop="zccssrq"
             width="200"
             align="center"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -335,7 +335,6 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
-          console.log(res.mesg);
           if (res) {
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);
@@ -394,6 +393,7 @@ export default {
         this.isSubmit = true;
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
+        console.log(json);
         this.$http.post("lawss/activiti/completeTask", {
           taskIds: this.taskIds,
           userId: this.userId,

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

@@ -349,12 +349,15 @@ export default {
               let aa = {
                 key: item.standId,
                 id: item.id,
-                standId: item.itemsNum,
+                standId: item.id,
                 itemsNum: item.itemsNum,
                 itemsName: item.itemsName,
+                xcxssrq: item.xcxssrq,
+                zccssrq: item.zccssrq,
                 workPeople: "请选择责任人"
               };
               children.push(aa);
+              console.log(children);
             }
           );
           this.dataList.forEach(key => {
@@ -373,7 +376,6 @@ export default {
           this.listForm = item.form;
           this.dataList = item.form.dataList;
         }
-
       });
     },
     //保存事件
@@ -400,6 +402,7 @@ export default {
       this.isSubmit = true;
       this.listForm.commentText = this.commentText;
       const json = JSON.stringify(this.listForm);
+      console.log(json);
       this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.taskIds,
         userId: this.userId,

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

@@ -96,12 +96,12 @@
             label="条款名称">
           </el-table-column>
           <el-table-column
-            prop="xcxssrqgj"
+            prop="xcxssrq"
             width="200"
             align="center"
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -110,7 +110,7 @@
             align="center"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -476,6 +476,7 @@ export default {
           this.listForm["id"] = item.id;
           // this.listForm.dataList = item.dataList;
           this.dataList = this.listForm.dataList;
+          console.log(this.dataList);
         } else {
           this.listForm = item.form;
           this.dataList = item.form.dataList;

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

@@ -95,21 +95,21 @@
             label="条款名称">
           </el-table-column>
           <el-table-column
-            prop="xcxssrqgj"
+            prop="xcxssrq"
             width="200"
             align="center"
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="zccssrqgj"
+            prop="zccssrq"
             width="200"
             align="center"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -95,21 +95,21 @@
                   label="条款名称">
           </el-table-column>
           <el-table-column
-                  prop="xcxssrqgj"
+                  prop="xcxssrq"
                   width="200"
                   align="center"
                   label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-                  prop="zccssrqgj"
+                  prop="zccssrq"
                   width="200"
                   align="center"
                   label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -95,21 +95,21 @@
             label="条款名称">
           </el-table-column>
           <el-table-column
-            prop="xcxssrqgj"
+            prop="xcxssrq"
             width="200"
             align="center"
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="zccssrqgj"
+            prop="zccssrq"
             width="200"
             align="center"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue

@@ -112,13 +112,13 @@
             </template>
           </el-table-column>
           <el-table-column
-                  prop="endTime"
+                  prop="overTime"
                   label="完成日期"
                   align="center"
                   width="150"
           >
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
+              <span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column :label="$t('m.operation')" align="center" width="50">

src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue

@@ -112,13 +112,13 @@
             </template>
           </el-table-column>
           <el-table-column
-                  prop="endTime"
+                  prop="overTime"
                   label="完成日期"
                   align="center"
                   width="150"
           >
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
+              <span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column :label="$t('m.operation')" align="center" width="50">

src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue

@@ -112,13 +112,13 @@
             </template>
           </el-table-column>
           <el-table-column
-                  prop="endTime"
+                  prop="overTime"
                   label="完成日期"
                   align="center"
                   width="150"
           >
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
+              <span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column :label="$t('m.operation')" align="center" width="50">

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -112,13 +112,13 @@
             </template>
           </el-table-column>
           <el-table-column
-            prop="endTime"
+            prop="overTime"
             label="完成日期"
             align="center"
             width="150"
           >
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
+              <span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column :label="$t('m.operation')" align="center" width="50">

src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue

@@ -112,13 +112,13 @@
             </template>
           </el-table-column>
           <el-table-column
-                  prop="endTime"
+                  prop="overTime"
                   label="完成日期"
                   align="center"
                   width="380"
           >
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
+              <span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column :label="$t('m.operation')" align="center" width="50">

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue

@@ -1048,6 +1048,8 @@ export default {
       this.sarAccessInfoSearch.standName = ''
       this.sarAccessInfo.standName = ''
       this.sarAccessInfo.standNumber = ''
+      this.sarAccessInfo.typeApplicable = ''
+      this.sarAccessInfo.syrz = ''
       this.sarAccessInfoSearch.advanceSearchVOStr = ''
       this.sarAccessInfoSearch.askType = '' // 监管类型
       this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -2982,8 +2982,9 @@ export default {
     },
     // 查询二级菜单
     selectMenu() {
-      this.$http.get('sarResource/ts-resource', {
+      this.$http.get('sarResource/ts-resource/getList', {
-        sorDivide: 'INLAND_STAND'
+        sorDivide: 'INLAND_STAND',
+        userId: this.$store.getters.userInfo.userId
       }, {}, res => {
         if (res.ok) {
           this.treeList = res.data
@@ -3207,7 +3208,7 @@ export default {
 
 
           const exportURL = interfaceUrl + 'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?' +
-              'exportType=' + this.saveExportType + '&exportContent=' + this.selectedList.join(',') + '&exportName=' + this.exportName + '&standType=' + this.standType
+              'exportType=' + this.saveExportType + '&exportContent=' + this.selectedList.join(',') + '&exportName=' + this.exportName + '&standType=' + this.standType + '&userId=' + this.$store.getters.userInfo.userId
           window.open(exportURL)
           this.$message.success('导出信息成功')
           this.exportLoading = false
@@ -3238,7 +3239,7 @@ export default {
         // this.$message.success('导出信息成功')
         //
         window.open(interfaceUrl + 'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?' +
-            'exportType=' + this.saveExportType + '&exportContent=' + exportEOStr + '&exportName=' + this.exportName + '&standType=' + this.standType)
+            'exportType=' + this.saveExportType + '&exportContent=' + exportEOStr + '&exportName=' + this.exportName + '&standType=' + this.standType + '&userId=' + this.$store.getters.userInfo.userId)
         this.$message.success('导出信息成功')
         this.exportLoading = false
       }

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -623,6 +623,7 @@
         </div>
       </el-drawer>
       <!-- 新增海外标准 -->
+<!--      编辑海外标准-->
       <el-drawer
         :title="modalshowtitle"
         :visible.sync="modalshowflag"
@@ -672,19 +673,17 @@
 
               <template v-if="index === 0" >
                 <el-form-item label="国家/地区" prop="" label-width="150px" class="add-form-item">
-                  <el-select v-model="sarStandardsInfoEO.country" filterable clearable>
+                  <el-select v-model="sarStandardsInfoEO.country" multiple filterable clearable>
                     <el-option
                         v-for="item in countryOptions"
                         placeholder="请选择"
                         :key="item.value"
                         :value="item.value"
                         :label="item.label"
-                    ></el-option>
+                    >
+                    </el-option>
                   </el-select>
                 </el-form-item>
-
-
-
                 <el-form-item label="标准类别" prop="standSort" label-width="150px" class="add-form-item">
                   <el-select v-model="sarStandardsInfoEO.standSort" filterable>
                     <el-option
@@ -944,6 +943,7 @@
             </template>
           </el-form>
         </div>
+<!--        提交/取消-->
         <div class="demo-drawer-footer">
           <el-button v-show="modalshowtitle === '新增海外标准'" type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="saveBt">保存</el-button>
           <el-button size="mini" class="common-button-primary" icon="el-icon-check" type="primary" @click="saveOrUpdateStands" :loading="isSubmit">提交</el-button>
@@ -1675,6 +1675,7 @@ export default {
         id: '',
         standType: 'FOREIGN', // 标准分类
         country: '',
+        countryArr:'',
         standSort: '',
         applyArctic: '',
         standNumber: '',
@@ -1941,7 +1942,7 @@ export default {
           {type: 'string', max: 100, message: '代替标准编号不能超过100个字符', trigger: 'change'}
         ],
         isRelateAccess: [
-          { required: true, message: '重要度不能为空', trigger: 'change' }
+          { required: false, message: '重要度不能为空', trigger: 'change' }
         ],
         issueTime:[
           {required: true, message: '发布日期不能为空', trigger: 'change'}
@@ -2102,6 +2103,19 @@ export default {
   props: {
   },
   watch: {
+    'sarStandardsInfoEO.country': {
+      handler (val) {
+        if (val !== '' && val !== null && typeof (val) !== 'undefined') {
+          if (val instanceof Array) {
+            this.sarStandardsInfoEO.countryArr = val.join(",");
+          } else {
+            this.sarStandardsInfoEO.countryArr = val
+          }
+        } else if (val === '') {
+          this.sarStandardsInfoEO.countryArr = []
+        }
+      }
+    },
     filterText(val) {
       this.$refs.tree.filter(val);
     }
@@ -2403,6 +2417,10 @@ export default {
     },
     // 编辑标准属性
     selectStandardPro (item, state) {
+      // this.sarStandardsInfoEO.country=JSON.parse(item.country );
+
+      // console.log(this.sarStandardsInfoEO.country);
+
       this.addOrUPdateFlag = 2
       this.modalshowtitle = '编辑海外标准'
       this.modalshowflag = true
@@ -2414,6 +2432,9 @@ export default {
             console.log(formFieldList, 'AAAAAAAAAAAAAAAAAAAAA')
           this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
           this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
+          if(item.country !== undefined && item.country !== null && item.country !== ''){
+            this.sarStandardsInfoEO.country = item.country.split(",");
+          }
           this.sarStandardsInfoEO.standSort = item.standSort
           if (this.sarStandardsInfoEO.putTime != null && this.sarStandardsInfoEO.putTime !== '') {
             this.sarStandardsInfoEO.putTime = this.sarStandardsInfoEO.putTime.replace(new RegExp(/-/gm), '/')
@@ -2669,8 +2690,9 @@ export default {
     },
     // 查询二级菜单
     selectMenu () {
-      this.$http.get('sarResource/ts-resource', {
+      this.$http.get('sarResource/ts-resource/getList', {
-        sorDivide: 'FOREIGN_STAND'
+        sorDivide: 'FOREIGN_STAND',
+        userId: this.$store.getters.userInfo.userId
       }, {}, res => {
         if (res.ok) {
           this.treeList = res.data
@@ -2820,14 +2842,14 @@ export default {
       if (this.saveExportType === 'apart') {
         if (this.selectedList != null && this.selectedList !== '') {
            const exportURL = interfaceUrl + 'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?' +
-             'exportType=' + this.saveExportType  + '&exportContent=' + this.selectedList.join(',') + '&exportName=' + this.exportName + '&standType=' + this.standType
+             'exportType=' + this.saveExportType  + '&exportContent=' + this.selectedList.join(',') + '&exportName=' + this.exportName + '&standType=' + this.standType + '&userId=' + this.$store.getters.userInfo.userId
           window.open(exportURL)
           this.$message.success('导出信息成功')
 
         }
       } else if (this.saveExportType === 'all') {
         let exportEOStr = JSON.stringify(this.SarExportSearchEo)
-        window.open(interfaceUrl+'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?exportType=' + this.saveExportType + '&exportContent=' + exportEOStr + '&exportName=' + this.exportName + '&standType=' + this.standType)
+        window.open(interfaceUrl+'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?exportType=' + this.saveExportType + '&exportContent=' + exportEOStr + '&exportName=' + this.exportName + '&standType=' + this.standType+ '&userId=' + this.$store.getters.userInfo.userId)
         this.$message.success('导出信息成功')
       }
       this.exportModelFlag = false
@@ -3088,6 +3110,7 @@ export default {
                   this.validateStandNumber(this.sarStandardsInfoEO).then((flag) => {
                       if (flag) {
                           // 时间格式修改
+                          this.sarStandardsInfoEO.country = this.sarStandardsInfoEO.countryArr;
                           let nowstandinfo = JSON.parse(JSON.stringify(this.sarStandardsInfoEO))
                           if (nowstandinfo.putTime != null && nowstandinfo.putTime !== '') {
                               nowstandinfo.putTime = this.$dateFormat(this.sarStandardsInfoEO.putTime, 'yyyy-MM-dd hh:mm:ss')
@@ -3118,6 +3141,8 @@ export default {
                               sarStandAttrObj[item.attrField] = nowstandinfo[item.attrField]
                           })
                           nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'")
+                        console.log("nowstandinfo");
+                        console.log(nowstandinfo);
                           this.$http.postData(this.addOrUPdateFlag === 1 ? 'sarStandardsInfo/sar-standards-info/addarStandardsInfo' : 'sarStandardsInfo/sar-standards-info/updateSarStandardsInfo', nowstandinfo, {
                               _this: this
                           }, res => {
@@ -3278,11 +3303,6 @@ export default {
 
       }
       formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
-      console.log("======")
-      console.log(formData.advanceSearchVOStr);
-
-
-
 
       this.SarExportSearchEo = formData
       this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue

@@ -76,10 +76,14 @@
               width="260px"
           >
             <template slot-scope="scope">
-              <span
+              <span v-if="scope.row.standSortShow === undefined"
                   style="margin-left: 10px">{{
                   scope.row.standSort + ' ' + scope.row.standNumber + '-' + scope.row.standYear
                 }}</span>
+              <span v-else
+                    style="margin-left: 10px">{{
+                  scope.row.standSortShow + ' ' + scope.row.standNumber + '-' + scope.row.standYear
+                }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -222,7 +226,7 @@
             <el-table
               :data="sarAccessListDatas"
               tooltip-effect="dark"
-              style="width: 100%"
+              style="width: 100%; padding: 0 3px"
               border
               height="100%"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
@@ -230,11 +234,6 @@
               @selection-change="selectOne"
               ref="selection"
             >
-              <el-table-column
-                type="selection"
-                width="55"
-                align="center">
-              </el-table-column>
               <el-table-column
                 prop="carType"
                 label="车型类别"
@@ -701,50 +700,67 @@ export default {
       this.standModel = false;
     },
     //添加标准确定事件
-    okStand() {
+    okStand(){
-      let _this = this;
+     if(this.standList.length > 0){
-      if (this.standList.length < 1) {
+       this.standList.forEach(item => {
-        _this.$message.warning("请选择标准");
+         let addIndex
-      } else {
+         addIndex = this.dataList.findIndex(items => {
-        for (let i = 0; i < this.dataList.length; i++) {
+           return items.standId === item.id
-          let newStand = false;
+         })
-          for (let j = 0; j < this.standList.length; j++) {
+         if(addIndex > -1){
-            if (this.standList[j].id == this.dataList[i].standId) {
+           this.$message.warning('请勿重复添加数据')
-              newStand = true;
+         }else{
-              this.standList.splice(j, 1)
+           this.dataList.push(item)
-              j--
+         }
-            }
+       })
-          }
+     }else{
-          if (newStand) {
+       this.$message.warning('请至少选择一条数据进行添加')
-            _this.$message.warning("请勿重复添加数据");
+     }
-          } else {
-            // _this.dataList.push(item);
-          }
-        }
-        this.standardData = []
-        _this.standModel = false;
-        for (var i = 0; i < this.standList.length; i++) {
-          this.standList1.push({
-            standId: this.standList[i].id,
-            projectId: this.localProEO.id
-          })
-        }
-        if (this.standList1 != '') {
-          this.$http.postData("sarStandProjectLibrary/batchInsert", this.standList1, {
-            _this: this
-          }, res => {
-            if (res.ok) {
-              // this.$message.success(res.message)
-              this.getDataList()
-            }
-          }, e => {
-          });
-        }
-        this.standList = []
-        this.standList1 = []
-        _this.standModel = false;
-      }
     },
+    // okStand() {
+    //   let _this = this;
+    //   if (this.standList.length < 1) {
+    //     _this.$message.warning("请选择标准");
+    //   } else {
+    //     for (let i = 0; i < this.dataList.length; i++) {
+    //       let newStand = false;
+    //       for (let j = 0; j < this.standList.length; j++) {
+    //         if (this.standList[j].id == this.dataList[i].standId) {
+    //           newStand = true;
+    //           this.standList.splice(j, 1)
+    //           j--
+    //         }
+    //       }
+    //       if (newStand) {
+    //         _this.$message.warning("请勿重复添加数据");
+    //       } else {
+    //         // _this.dataList.push(item);
+    //       }
+    //     }
+    //     this.standardData = []
+    //     _this.standModel = false;
+    //     for (var i = 0; i < this.standList.length; i++) {
+    //       this.standList1.push({
+    //         standId: this.standList[i].id,
+    //         projectId: this.localProEO.id
+    //       })
+    //     }
+    //     if (this.standList1 != '') {
+    //       this.$http.postData("sarStandProjectLibrary/batchInsert", this.standList1, {
+    //         _this: this
+    //       }, res => {
+    //         if (res.ok) {
+    //           // this.$message.success(res.message)
+    //           this.getDataList()
+    //         }
+    //       }, e => {
+    //       });
+    //     }
+    //     this.standList = []
+    //     this.standList1 = []
+    //     _this.standModel = false;
+    //   }
+    // },
     //获取标准
     getStandrd(data){
       this.detailedId = data.id
@@ -763,6 +779,14 @@ export default {
           this.standModel = true;
         }
         this.standardData = res.data.records
+        this.standardData.forEach(item => {
+          if(item.zccssrqgj === '-'){
+            item.zccssrqgj = ''
+          }
+          if(item.xcxssrqgj === '-'){
+            item.xcxssrq = ''
+          }
+        })
         this.totalDo = res.data.total
         this.standModel = true;
       })

src/pages/searchCenter/pages/standardSearch.vue

@@ -2530,6 +2530,9 @@
 <style lang="less" scoped>
     @import '~@/assets/styles/mixins';
     @import '~@/assets/styles/style';
+    /deep/ p{
+        display: inline;
+    }
     /deep/.highlight-class {
         color: red !important;
     }