Merge pull request '干线运输费-批量新增模板更新' (#14) from master-模板替换 into master

Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/14

src/views/emis/emisQuotePrice/transQuotePriceList.vue

@@ -186,20 +186,6 @@
             <div  class="link-type" @click="handleUpdate(scope.row)">{{scope.row.quoteId}}</div>
          </template>
       </el-table-column> -->   
-       <el-table-column  :label="$t('状态')" align="center" prop="uploadStatus" min-width="80" :show-overflow-tooltip="true" >
-        <template slot-scope="scope">
-              <el-tag v-if="scope.row.uploadStatus==1" type="success">新增成功</el-tag>
-              <el-tag v-if="scope.row.uploadStatus==0" type="info">待新增</el-tag>
-              <el-tag v-if="scope.row.uploadStatus==-1" type="danger">新增异常</el-tag>
-          </template>
-      </el-table-column>
-      <el-table-column  :label="$t('异常信息')" align="center" prop="errorInfo" min-width="300" :show-overflow-tooltip="true" >
-        <template slot-scope="scope">
-              <span v-if="scope.row.uploadStatus==-1" style="color:red">{{ scope.row.errorInfo }}</span>
-              <span v-if="scope.row.uploadStatus==1">新增成功</span>
-              <span v-if="scope.row.uploadStatus==0">待新增</span>
-          </template>
-      </el-table-column>
       <el-table-column label="报价名称" align="left" prop="quoteName" :show-overflow-tooltip="true" width="350" >
          <template slot-scope="scope">
             <div  class="link-type" @click="handleUpdate(scope.row)">
@@ -252,7 +238,22 @@
       <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
-
+      <el-table-column  label="计算规则" align="center" prop="exprJson"  width="470"/>
+      <el-table-column  :label="$t('状态')" align="center" prop="uploadStatus" min-width="80" :show-overflow-tooltip="true" >
+            <template slot-scope="scope">
+                  <el-tag v-if="scope.row.uploadStatus==1" type="success">新增成功</el-tag>
+                  <el-tag v-if="scope.row.uploadStatus==0" type="info">待新增</el-tag>
+                  <el-tag v-if="scope.row.uploadStatus==-1" type="danger">新增异常</el-tag>
+              </template>
+          </el-table-column>
+      <el-table-column  :label="$t('异常信息')" align="center" prop="errorInfo" min-width="300" :show-overflow-tooltip="true" >
+        <template slot-scope="scope">
+              <span v-if="scope.row.uploadStatus==-1" style="color:red">{{ scope.row.errorInfo }}</span>
+              <span v-if="scope.row.uploadStatus==1">新增成功</span>
+              <span v-if="scope.row.uploadStatus==0">待新增</span>
+          </template>
+      </el-table-column>
+      
 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -300,7 +301,7 @@
                   :on-change="fileChange"
                   :before-upload="beforeUpload">
                   <el-button slot="trigger" plain class="filter-item" size="mini"  type="primary" >选择文件</el-button>
-                  <el-link type="primary" style="line-height: 28px;font-size:13px;color:blue" href="/static/tpl/imp_trans_quote_price.xlsx">下载导入Excel模板</el-link>
+                  <el-link type="primary" style="line-height: 28px;font-size:13px;color:blue" href="/static/tpl/imp_trans_quote.xlsx">下载导入Excel模板</el-link>
                   <div v-if="uploadExcelDataInfo !=''" style="color: black;font-size: 12px;font-weight: 800;">{{ fileName }} {{ uploadExcelDataInfo }}</div>
                 </el-upload>
                 <el-alert
@@ -530,12 +531,13 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      if( row.quoteId || this.ids.length>1){
       this.resetRefreshId="vipquote-"+this.getUUID();
-
       this.currentId = row.quoteId || this.ids;
       this.openForm = true;
       this.isCopy = false;
       this.titleForm = "修改干线运输费";
+      }
     },
     handleCopy() {
       this.resetRefreshId="vipquote-"+this.getUUID();