Merge branch 'develop' into 'test'

Develop

See merge request !87

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"
@@ -375,7 +354,6 @@ export default {
         this.listForm.prcName = this.prcName;
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
-        console.log(item.dataList)
         this.dataList = item.dataList;
         this.listForm.applyUpdUserId = item.applyUpdUserId;
         this.listForm.jlUserId = item.jlUserId;
@@ -429,7 +407,7 @@ export default {
         }
       }
     },
-    //驳回事件
+    // 驳回事件
     beforeBack() {
       if(!this.commentText){
         this.$message.warning('请填写审批意见')

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/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,7 +349,7 @@ export default {
               let aa = {
                 key: item.standId,
                 id: item.id,
-                standId: item.itemsNum,
+                standId: item.id,
                 itemsNum: item.itemsNum,
                 itemsName: item.itemsName,
                 workPeople: "请选择责任人"

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -671,20 +671,37 @@
               </el-col>
 
               <template v-if="index === 0" >
-                <el-form-item label="国家/地区" prop="" label-width="150px" class="add-form-item">
+<!--                <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" filterable clearable>-->
+<!--                    <el-option-->
+<!--                        v-for="item in countryOptions"-->
+<!--                        placeholder="请选择"-->
+<!--                        :key="item.value"-->
+<!--                        :value="item.value"-->
+<!--                        :label="item.label"-->
+<!--                    ></el-option>-->
+<!--                  </el-select>-->
+<!--                </el-form-item>-->
+                {{sarStandardsInfoEO.country}}
+                <el-form-item label="国家/地区" prop="countryArea" class="search-item">
+                  <el-select
+                      v-model="sarStandardsInfoEO.country"
+                      multiple
+                      placeholder="请选择"
+                      filterable
+                      :disabled="false"
+                      class="wx-resolve"
+                  >
                     <el-option
                         v-for="item in countryOptions"
-                        placeholder="请选择"
-                        :key="item.value"
                         :value="item.value"
+                        :key="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
@@ -2403,6 +2420,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 +2435,10 @@ export default {
             console.log(formFieldList, 'AAAAAAAAAAAAAAAAAAAAA')
           this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
           this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
+          console.log(item.country);
+          console.log("hello")
+          this.sarStandardsInfoEO.country=item.country;
+          console.log(this.sarStandardsInfoEO.country);
           this.sarStandardsInfoEO.standSort = item.standSort
           if (this.sarStandardsInfoEO.putTime != null && this.sarStandardsInfoEO.putTime !== '') {
             this.sarStandardsInfoEO.putTime = this.sarStandardsInfoEO.putTime.replace(new RegExp(/-/gm), '/')
@@ -3088,6 +3113,8 @@ export default {
                   this.validateStandNumber(this.sarStandardsInfoEO).then((flag) => {
                       if (flag) {
                           // 时间格式修改
+                          this.sarStandardsInfoEO.country=JSON.stringify(this.sarStandardsInfoEO.country);
+                          console.groupCollapsed(this.sarStandardsInfoEO.country);
                           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')

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;
       })