md

src/views/emis/emisQuoteDispArea/dispAreaPanel.vue

@@ -243,6 +243,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.areaId)
+      this.currentId=this.ids.slice(-1)*1;
       this.single = selection.length!==1
       this.multiple = !selection.length
     },

src/views/emis/emisQuotePrice/emisQuotePriceForm.vue

@@ -119,7 +119,7 @@
                           v-for="item in emisQuoteSendAreaList"
                           :key="item.areaId"
                           :label="item.areaName"
-                          :value="item.areaId"
+                          :value="item.areaId*1"
                         />
                       </el-select>
                       </el-form-item>
@@ -370,6 +370,8 @@ export default {
           });
         }else{
             this.reset();
+            this.form.billType='1';
+            this.form.feeType='1001';
             this.initSendAreaList();
             this.initDispAreaList();
 
@@ -388,14 +390,16 @@ export default {
       let queryParams = {};
       listEmisQuoteSendArea(queryParams).then(response => {
         this.emisQuoteSendAreaList = response.rows;
-        // if(this.form.sendAreaId != null){
+        if(this.form.sendAreaId != null){
-        //   this.emisQuoteSendAreaList.forEach(item=>{
+          this.emisQuoteSendAreaList.forEach(item=>{
-        //       if(this.form.sendAreaId==item.areaId){
+              if(this.form.sendAreaId==item.areaId){
-        //         // this.form.sendAreaSite=item.areaSiteCode;
+                this.form.sendAreaName=item.areaName;
-        //         this.form.sendAreaText=item.areaSite;
+                this.form.sendAreaSiteCode=item.areaSiteCode;
-        //       }
+                this.form.sendAreaSite=item.areaSite;
-        //   });
+              }
-        // }
+          });
+        }
+
         this.loading = false;
       });
     },
@@ -404,14 +408,15 @@ export default {
       let queryParams = {};
       listEmisQuoteDispArea(queryParams).then(response => {
         this.emisQuoteDispAreaList = response.rows;
-        // if(this.form.dispAreaId != null){
+        if(this.form.dispAreaId != null){
-        //   this.emisQuoteDispAreaList.forEach(item=>{
+          this.emisQuoteDispAreaList.forEach(item=>{
-        //       if(this.form.dispAreaId==item.areaId){
+              if(this.form.dispAreaId==item.areaId){
-        //         // this.form.dispAreaSite=item.areaSiteCode;
+                this.form.dispAreaName=item.areaName;
-        //         // this.form.dispAreaText=item.areaSite;
+                this.form.dispAreaSiteCode=item.areaSiteCode;
-        //       }
+                this.form.dispAreaSite=item.areaSite;
-        //   });
+              }
-        // }
+          });
+        }
         this.loading = false;
       });
     },
@@ -490,11 +495,11 @@ export default {
         useSite: null,
         transLineCode: null,
         transLine: null,
-        feeType: '1001',
+        feeType: null,
         prodCode: null,
         prodName: null,
         recPayType: null,
-        billType: 1,
+        billType: null,
         otherType1: null,
         otherType2: null,
         carryType: null,

src/views/emis/emisQuoteSendArea/sendAreaPanel.vue

@@ -40,8 +40,8 @@
                     <el-button
                       type="primary"
                       size="mini"
+                      :disabled="single"
                       @click="handleSelect"
-                      v-hasPermi="['emis:emisQuoteSendArea:query']"
                     >使用选中区域</el-button>
                   </el-col>
                   <!-- <el-col :span="1.5">
@@ -67,7 +67,7 @@
               </el-row>
         <el-table
           size="mini"
-          ref="areaTable"
+          ref="areaTable1"
           border stripe
           highlight-current-row
           v-loading="loading"
@@ -88,29 +88,6 @@
 
             </template>
           </el-table-column>
-          <!-- <el-table-column :label="$t('同步类型')" align="center" prop="sync" min-width="100" /> -->
-          <!-- <el-table-column :label="$t('启用状态')" align="center" prop="status" min-width="100" /> -->
-          <!-- <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" /> -->
-          <!-- <el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" /> -->
-          <!-- <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
-            <template slot-scope="scope">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-edit"
-                @click="handleUpdate(scope.row)"
-                v-hasPermi="['emis:emisQuoteSendArea:edit']"
-              >修改</el-button>
-
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['emis:emisQuoteSendArea:remove']"
-              >删除</el-button>
-            </template>
-          </el-table-column> -->
         </el-table>
       </el-col>
       <el-col :span="10" :xs="10" >
@@ -215,23 +192,9 @@ export default {
     handleSelectArea(row, event, column){
       this.currentId=row.areaId;
       this.currentArea = row;
-      this.ids=[row.id]
+      this.ids=[row.areaId]
       this.single=false;
       this.multiple=false;
-
-      // let index = this.ids.findIndex(item => {
-      //   // 判断已选数组中是否已存在该条数据
-      //   return item.id == row.id
-      // })
-      // if (index == -1) {
-      //   // 如果未存在，设置已选状态，并在list中添加这条数据
-      //   this.$refs.areaTable.toggleRowSelection(row, true); //设置复选框为选中状态
-      //   this.ids.push(row)
-      // } else {
-      //   // 如果已存在，设置未选状态，并在list中删除这条数据
-      //   this.$refs.areaTable.toggleRowSelection(row, false); //设置复选框为未选状态
-      //   this.ids.splice(index, 1)
-      // }
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -246,6 +209,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.areaId)
+      this.currentId=this.ids.slice(-1)*1;
       this.single = selection.length!==1
       this.multiple = !selection.length
     },