lilei 1 day ago
parent
commit
a2339ad057

BIN
public/templ/批量上线导入模板.xlsx


+ 33 - 0
src/api/product.js

@@ -569,6 +569,39 @@ export const saveBatchImportProduct = (params) => {
   })
 }
 
+// 批量导入上线产品
+export const batchImportOnlineProduct = (params) => {
+  return axios({
+    url: '/product/importOnline',
+    data: params,
+    method: 'post',
+  })
+}
+
+// 导出错误项上线产品
+export const exportErrorOnlineProduct = (params) => {
+  return axios({
+    url: '/product/importOnlineError',
+    data: params,
+    method: 'post',
+    responseType: 'blob',
+    headers:{
+        'module': encodeURIComponent('导出错误项上线产品')
+    }
+  })
+}
+// 批量保存上线产品
+export const saveBatchImportOnlineProduct = (params) => {
+  return axios({
+    url: '/product/onlineBatch',
+    data: params,
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('批量导入上线产品')
+    }
+  })
+}
+
 // 价格变更状态
 export const priceChangeEnabled = (params) => {
   return axios({

+ 0 - 1
src/components/UploadFile/index.vue

@@ -234,7 +234,6 @@ export default {
               }
             }
           })
-          // console.log(temp)
           obj = JSON.stringify(temp)
         }
       }

+ 25 - 7
src/views/productManagement/productInfo/importGuideModal.vue

@@ -18,7 +18,7 @@
             <li>1) 请先下载导入模板,模板中已标示出必填项</li>
             <li>2) 产品编码具有唯一性,{{ guideType=='1'?'系统中已存在的无法导入':(guideType=='2'?'下线导入':'上线导入')+',必须是系统中已存在的产品编码' }}</li>
             <li v-if="guideType=='1'">3) 产品品牌、产品分类、单位、包装数单位、出库仓库、退货仓库,必须是系统中已经存在的值,否则无法导入</li>
-            <li v-if="guideType=='2'"><a :href="filePath" style="margin: 5px 0 0 15px;display: block;">
+            <li v-if="guideType=='2'||guideType=='3'"><a :href="guideType=='3' ? fileOnlinPath : filePath" style="margin: 5px 0 0 15px;display: block;">
               <a-icon type="download" style="padding-right: 5px;" />下载导入模板
             </a></li>
           </ul>
@@ -42,10 +42,11 @@
               ref="importUpload"
               :maxNums="1"
               fileType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
-              uploadType="import"
-              :action="attachAction"
+              :uploadType="guideType=='3' ? 'attach' : 'import'"
+              :action="guideType=='3' ? attachOnlinAction : attachAction"
               :uploadParams="uploadParams"
               upText="添加文件"
+              @remove="resetSearchForm"
               @change="changeImport"></Upload>
           </div>
         </div>
@@ -70,7 +71,7 @@
     <!-- 导入 -->
     <chooseImportModal :openModal="openImportModal" :paramsData="paramsData" @close="handleClose" @ok="hanldeOk" />
     <offlineImportModal :openModal="openOfflineImportModal" :paramsData="paramsData" @close="handleClose" @ok="hanldeOk" />
-    <onlineImportModal :openModal="openOfflineImportModal" :paramsData="paramsData" @close="handleClose" @ok="hanldeOk" />
+    <onlineImportModal :openModal="openOnlineImportModal" :paramsData="paramsData" @close="handleClose" @ok="hanldeOk" />
   </a-modal>
 </template>
 
@@ -100,24 +101,34 @@ export default {
       isShow: this.openModal, //  是否打开弹框
       openImportModal: false, //  打开新增产品导入弹框
       openOfflineImportModal: false, // 打开下线产品导入弹框
+      openOnlineImportModal: false, // 打开下线产品导入弹框
       attachAction: process.env.VUE_APP_API_BASE_URL + '/upload', // 上传地址
+      attachOnlinAction: process.env.VUE_APP_API_BASE_URL + '/product/importOnline',
       paramsData: null, // 导入参数
       uploadParams: {// 上传参数
         savePathType: 'local'
       },
       exportLoading: false, // 导出按钮加载状态
-      filePath: location.protocol + '//' + location.host + '/templ/批量下线导入模板.xlsx'// 模板地址
+      filePath: location.protocol + '//' + location.host + '/templ/批量下线导入模板.xlsx', // 模板地址
+      fileOnlinPath: location.protocol + '//' + location.host + '/templ/批量上线导入模板.xlsx'
     }
   },
   methods: {
+    // 清空数据
+    resetSearchForm () {
+      this.$refs.importUpload.setFileList() //  清空导入文件
+      this.paramsData = null //  清空上传数据
+    },
     // 下一步
     handlerNextStep () {
       const _this = this
       if (_this.paramsData) {
         if (_this.guideType == 1) {
           _this.openImportModal = true
-        } else {
+        } else if (_this.guideType == 2) {
           _this.openOfflineImportModal = true
+        } else {
+          _this.openOnlineImportModal = true
         }
       } else {
         _this.$message.warning('添加文件后再进行下一步操作!')
@@ -125,10 +136,16 @@ export default {
     },
     // 上传文件  change
     changeImport (file) {
-      if (file) {
+      if (file && this.guideType != 3) {
         this.paramsData = {
           path: file
         }
+      } else {
+        if (file && JSON.parse(file).length > 0) {
+          this.paramsData = Object.assign({}, JSON.parse(file)[0] || null)
+        } else {
+          this.paramsData = null
+        }
       }
     },
     // 导入
@@ -142,6 +159,7 @@ export default {
     handleClose () {
       this.openImportModal = false
       this.openOfflineImportModal = false
+      this.openOnlineImportModal = false
       this.isShow = false
     },
     // 下载模板

+ 2 - 2
src/views/productManagement/productInfo/list.vue

@@ -259,7 +259,7 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import importGuideModal from './importGuideModal.vue'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
 // 接口
-import { productList, productAudit, productBatchAudit, productDel, productOnline, productBatchOnline, productExport, saveBatchImportProduct, importSaveBatch, updateHaltProdFlag } from '@/api/product'
+import { productList, productAudit, productBatchAudit, productDel, productOnline, productBatchOnline, productExport, saveBatchImportProduct, saveBatchImportOnlineProduct, importSaveBatch, updateHaltProdFlag } from '@/api/product'
 export default {
   name: 'ProductInfoList',
   mixins: [commonMixin],
@@ -368,7 +368,7 @@ export default {
     hanldeOk (obj) {
       this.spinning = true
       // importSaveBatch 下线导入
-      const ajaxName = obj && obj.type && obj.type == 'offline' ? importSaveBatch : saveBatchImportProduct
+      const ajaxName = obj && obj.type && obj.type == 'offline' ? importSaveBatch : (obj && obj.type && obj.type == 'online' ? saveBatchImportOnlineProduct : saveBatchImportProduct)
       ajaxName(obj).then(res => {
         if (res.status == 200) {
           this.resetSearchForm()

+ 21 - 73
src/views/productManagement/productInfo/onlineImportModal.vue

@@ -23,7 +23,6 @@
         :pagination="false"
         bordered>
       </a-table>
-      <a-divider />
       <!-- 不可导入数据 -->
       <p class="red">不可导入数据{{ unLoadData.length }}条</p>
       <a-table
@@ -57,6 +56,7 @@
           type="primary"
           id="chooseImport-error"
           size="large"
+          :class="unLoadData.length==0?'button-grey':'button-primary'"
           class="button-error"
           @click="handleError"
           style="padding: 0 40px;margin-left: 15px;">导出错误项</a-button>
@@ -69,7 +69,7 @@
 import { commonMixin } from '@/utils/mixin'
 import { hdExportExcel } from '@/libs/exportExcel'
 // 接口
-import { batchImportProduct, exportErrorProduct } from '@/api/product'
+import { exportErrorOnlineProduct } from '@/api/product'
 export default {
   name: 'SalesOnlineImportModal',
   mixins: [commonMixin],
@@ -89,92 +89,40 @@ export default {
     return {
       isShow: this.openModal, //  是否打开弹框
       nowColumns: [
-        { title: '序号', dataIndex: 'no', width: '3%', align: 'center' },
-        { title: '产品名称', dataIndex: 'name', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品编码', dataIndex: 'code', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'origCode', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '其它编码', dataIndex: 'otherCode', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品品牌', dataIndex: 'productBrandName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '一级分类', dataIndex: 'productTypeName1', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '二级分类', dataIndex: 'productTypeName2', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '三级分类', dataIndex: 'productTypeName3', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单位', dataIndex: 'unit', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '包装数', dataIndex: 'packQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '包装数单位', dataIndex: 'packQtyUnit', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '是否箭冠产品', dataIndex: 'arrow', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '条形码', dataIndex: 'qrCode', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品尺寸', dataIndex: 'size', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '产品重量(g)', dataIndex: 'weight', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '颜色', dataIndex: 'color', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '产品内盒尺寸', dataIndex: 'boxSize', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '产品说明', dataIndex: 'description', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '出库仓库', dataIndex: 'outWarehouseName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '退货仓库', dataIndex: 'returnWarehouseName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '其他说明', dataIndex: 'otherDesc', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+        { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', width: '95%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       loadData: [], // 可导入数据
       nowUnColumns: [
-        { title: '序号', dataIndex: 'no', width: '3%', align: 'center' },
-        { title: '产品名称', dataIndex: 'name', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品编码', dataIndex: 'code', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'origCode', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '其它编码', dataIndex: 'otherCode', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品品牌', dataIndex: 'productBrandName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '一级分类', dataIndex: 'productTypeName1', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '二级分类', dataIndex: 'productTypeName2', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '三级分类', dataIndex: 'productTypeName3', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单位', dataIndex: 'unit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '包装数', dataIndex: 'packQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '包装数单位', dataIndex: 'packQtyUnit', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '是否箭冠产品', dataIndex: 'arrow', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '条形码', dataIndex: 'qrCode', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品尺寸', dataIndex: 'size', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '产品重量(g)', dataIndex: 'weight', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '颜色', dataIndex: 'color', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '产品内盒尺寸', dataIndex: 'boxSize', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '产品说明', dataIndex: 'description', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '其他说明', dataIndex: 'otherDesc', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '出库仓库', dataIndex: 'outWarehouseName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '退货仓库', dataIndex: 'returnWarehouseName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '备注', dataIndex: 'errorMsg', width: '5%', align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', width: '35%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '备注', dataIndex: 'remarks', width: '60%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       unLoadData: [], // 导入错误数据
       loading: false// 列表加载状态
     }
   },
   methods: {
-    // 获取导入列表数据
-    getData () {
-      const _this = this
-      this.loading = true
-      const params = {
-        path: this.paramsData.path
-      }
-      batchImportProduct(params).then(res => {
-        this.loading = false
-        if (res.status == 200) {
-          // 计算可导入列表序号
-          if (res.data.rightList && res.data.rightList.length > 0) {
-            res.data.rightList.map((item, index) => {
-              item.no = index + 1
-            })
-          }
-          // 计算错误项列表序号
-          if (res.data.errorList && res.data.errorList.length > 0) {
-            res.data.errorList.map((item, index) => {
-              item.no = index + 1
-            })
-          }
-          _this.loadData = res.data.rightList || []
-          _this.unLoadData = res.data.errorList || []
-        }
+    formatData (data) {
+      data.map((item, index) => {
+        item.no = index + 1
+        item.id = new Date().getTime() + index
       })
+      return data
+    },
+    getData () {
+      const paramsData = this.paramsData
+      this.loadData = this.formatData(paramsData.rightList || [])
+      this.unLoadData = this.formatData(paramsData.errorList || [])
+      console.log(this.loadData)
+      console.log(this.unLoadData)
     },
     // 确认导入
     handleSubmit () {
       if (this.loadData.length == 0) {
         this.$message.warning('无可导入产品!')
       } else {
+        this.loadData.type = 'online'
         this.$emit('ok', this.loadData)
         this.isShow = false
       }
@@ -187,7 +135,7 @@ export default {
         return
       }
       _this.spinning = true
-      hdExportExcel(exportErrorProduct, _this.unLoadData, '导出产品错误项', function () {
+      hdExportExcel(exportErrorOnlineProduct, _this.unLoadData, '导出上线产品错误项', function () {
         _this.spinning = false
       })
     }

+ 28 - 2
src/views/reportData/dailyReport/table3.vue

@@ -17,7 +17,8 @@
           </th>
           <th key="2" colspan="8" class="ant-table-align-center" style="text-align: center;"><span class="ant-table-header-column"><div><span class="ant-table-column-title">品牌</span><span class="ant-table-column-sorter"></span></div></span></th>
           <th key="3" colspan="4" class="ant-table-align-center" style="text-align: center;"><span class="ant-table-header-column"><div><span class="ant-table-column-title">轮胎</span><span class="ant-table-column-sorter"></span></div></span></th>
-          <th key="4" colspan="1" class="ant-table-align-center ant-table-row-cell-last" style="text-align: center;"><span class="ant-table-header-column"><div><span class="ant-table-column-title">品牌+轮胎</span><span class="ant-table-column-sorter"></span></div></span></th>
+          <th key="4" colspan="4" class="ant-table-align-center" style="text-align: center;"><span class="ant-table-header-column"><div><span class="ant-table-column-title">NGK</span><span class="ant-table-column-sorter"></span></div></span></th>
+          <th key="5" colspan="1" class="ant-table-align-center ant-table-row-cell-last" style="text-align: center;"><span class="ant-table-header-column"><div><span class="ant-table-column-title">品牌+轮胎+NGK</span><span class="ant-table-column-sorter"></span></div></span></th>
         </tr>
         <tr>
           <th style="text-align: center;"><span class="ant-table-header-column"><div><span class="ant-table-column-title">年度目标</span><span class="ant-table-column-sorter"></span></div></span></th>
@@ -32,6 +33,10 @@
           <th style="text-align: center;"><span class="ant-table-header-column"><div><span class="ant-table-column-title">{{ months }}月销售额截止达成</span><span class="ant-table-column-sorter"></span></div></span></th>
           <th style="text-align: center;"><span class="ant-table-header-column"><div><span class="ant-table-column-title">累计{{ months }}月截止完成</span><span class="ant-table-column-sorter"></span></div></span></th>
           <th style="text-align: center;"><span class="ant-table-header-column"><div><span class="ant-table-column-title">今日销售额</span><span class="ant-table-column-sorter"></span></div></span></th>
+          <th style="text-align: center;"><span class="ant-table-header-column"><div><span class="ant-table-column-title">截止1-{{ months-1 }}月销售额</span><span class="ant-table-column-sorter"></span></div></span></th>
+          <th style="text-align: center;"><span class="ant-table-header-column"><div><span class="ant-table-column-title">{{ months }}月销售额截止达成</span><span class="ant-table-column-sorter"></span></div></span></th>
+          <th style="text-align: center;"><span class="ant-table-header-column"><div><span class="ant-table-column-title">累计{{ months }}月截止完成</span><span class="ant-table-column-sorter"></span></div></span></th>
+          <th style="text-align: center;"><span class="ant-table-header-column"><div><span class="ant-table-column-title">今日销售额</span><span class="ant-table-column-sorter"></span></div></span></th>
           <th class="ant-table-align-center ant-table-row-cell-break-word ant-table-row-cell-last" style="text-align: center;"><span class="ant-table-header-column"><div><span class="ant-table-column-title">{{ months }}月销售额截止达成</span><span class="ant-table-column-sorter"></span></div></span></th>
         </tr>
       </thead>
@@ -46,7 +51,7 @@
             :colspan="index==list.length-1&&si==1?2:1"
             :style="index==list.length-1?'color: red;font-weight:bold;background:#dfdeff;border-color:#c7c7ff;':''"
           >
-            {{ si>1 ? Number(item[sitem.dataIndex]).toFixed(2) : item[sitem.dataIndex].toString() }}{{ sitem.title.indexOf('率')>=0?'%':'' }}
+            {{ si>1 ? Number(item[sitem.dataIndex]||0).toFixed(2) : item[sitem.dataIndex].toString() }}{{ sitem.title.indexOf('率')>=0?'%':'' }}
           </td>
         </tr>
       </tbody>
@@ -174,6 +179,27 @@ export default {
           align: 'center',
           width: '100'
         },
+        {
+          title: '截止1-' + (this.months - 1) + '月销售额',
+          dataIndex: 'histSalesRealNGKAmount',
+          align: 'center',
+          width: '100'
+        }, {
+          title: this.months + '月销售额截止达成',
+          dataIndex: 'currSalesNGKReal',
+          align: 'center',
+          width: '130'
+        }, {
+          title: '累计' + this.months + '月截止完成',
+          dataIndex: 'accuSalesRealNGKAmount',
+          align: 'center',
+          width: '100'
+        }, {
+          title: '今日销售额',
+          dataIndex: 'todaySalesNGKReal',
+          align: 'center',
+          width: '100'
+        },
         {
           title: this.months + '月销售额截止达成',
           dataIndex: 'totalCurrSalesTireReal',

+ 0 - 2
src/views/salesManagement/sendOutOrder/chooseImportModal.vue

@@ -185,8 +185,6 @@ export default {
       const paramsData = JSON.parse(JSON.stringify(this.paramsData))
       this.loadData = this.formatData(paramsData.rightList || [])
       this.unLoadData = this.formatData(paramsData.errorList || [])
-      console.log(this.loadData)
-      console.log(this.unLoadData)
     },
     // 确认导入
     handleSubmit () {

+ 21 - 7
src/views/setting/removeSetting/baseModal.vue

@@ -40,8 +40,18 @@
         </a-row>
         <a-row :gutter="15">
           <a-col :span="20">
-            <a-form-model-item label="运费、服务费" prop="tireSubsidyYfFwf">
-              <a-radio-group name="radioGroup" v-model="form.tireSubsidyYfFwf">
+            <a-form-model-item label="运费" prop="tireSubsidyYf">
+              <a-radio-group name="radioGroup" v-model="form.tireSubsidyYf">
+                <a-radio value="1">剔除</a-radio>
+                <a-radio value="0">不剔除</a-radio>
+              </a-radio-group>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="15">
+          <a-col :span="20">
+            <a-form-model-item label="服务费" prop="tireSubsidyFwf">
+              <a-radio-group name="radioGroup" v-model="form.tireSubsidyFwf">
                 <a-radio value="1">剔除</a-radio>
                 <a-radio value="0">不剔除</a-radio>
               </a-radio-group>
@@ -107,14 +117,16 @@ export default {
         dealerSn: undefined,
         configType: 'TIRE_SUBSIDY',
         bizSn: undefined, // bizsn
-        tireSubsidyYfFwf: undefined,
+        tireSubsidyYf: undefined,
+        tireSubsidyFwf: undefined,
         tireSubsidyZl: undefined,
         tireSubsidyGc: undefined
       },
       rules: {
         bizNo: [{ required: true, message: '请输入业务单号', trigger: ['change', 'blur'] }],
         dealerSn: [{ required: true, message: '请选择客户', trigger: ['change', 'blur'] }],
-        tireSubsidyYfFwf: [{ required: true, message: '请选择', trigger: ['change', 'blur'] }],
+        tireSubsidyYf: [{ required: true, message: '请选择', trigger: ['change', 'blur'] }],
+        tireSubsidyFwf: [{ required: true, message: '请选择', trigger: ['change', 'blur'] }],
         tireSubsidyZl: [{ required: true, message: '请选择', trigger: ['change', 'blur'] }],
         tireSubsidyGc: [{ required: true, message: '请选择', trigger: ['change', 'blur'] }]
       },
@@ -183,7 +195,8 @@ export default {
         bizNo: '',
         dealerSn: undefined,
         bizSn: undefined, // bizsn
-        tireSubsidyYfFwf: undefined,
+        tireSubsidyYf: undefined,
+        tireSubsidyFwf: undefined,
         tireSubsidyZl: undefined,
         tireSubsidyGc: undefined
       }
@@ -194,13 +207,14 @@ export default {
     },
     getDetail () {
       bizRemoveConfigDetail({ bizSn: this.bizSn, configType: 'TIRE_SUBSIDY' }).then(res => {
-        const { bizSn, bizNo, dealerSn, dealerName, tireSubsidyYfFwf, tireSubsidyZl, tireSubsidyGc } = res.data
+        const { bizSn, bizNo, dealerSn, dealerName, tireSubsidyYf, tireSubsidyFwf, tireSubsidyZl, tireSubsidyGc } = res.data
         this.dealerData = { dealerName: dealerName }
         this.form = Object.assign(this.form, {
           bizNo: bizNo,
           dealerSn: dealerSn,
           bizSn: bizSn,
-          tireSubsidyYfFwf: tireSubsidyYfFwf,
+          tireSubsidyYf: tireSubsidyYf,
+          tireSubsidyFwf: tireSubsidyFwf,
           tireSubsidyZl: tireSubsidyZl,
           tireSubsidyGc: tireSubsidyGc
         })

+ 5 - 4
src/views/setting/removeSetting/list.vue

@@ -174,12 +174,13 @@ export default {
         { title: '业务单号', dataIndex: 'bizNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务状态', dataIndex: 'billStatusName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务时间', dataIndex: 'bizDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'dealerName', width: '18%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '运费、服务费', dataIndex: 'tireSubsidyYfFwf', width: '10%', align: 'center', customRender: function (text) { return a[text] } },
+        { title: '客户名称', dataIndex: 'dealerName', width: '16%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '运费', dataIndex: 'tireSubsidyYf', width: '8%', align: 'center', customRender: function (text) { return a[text] } },
+        { title: '服务费', dataIndex: 'tireSubsidyFwf', width: '8%', align: 'center', customRender: function (text) { return a[text] } },
         { title: '增量补贴', dataIndex: 'tireSubsidyZl', width: '8%', align: 'center', customRender: function (text) { return a[text] } },
-        { title: '供应商返利', dataIndex: 'tireSubsidyGc', width: '10%', align: 'center', customRender: function (text) { return a[text] } },
+        { title: '供应商返利', dataIndex: 'tireSubsidyGc', width: '8%', align: 'center', customRender: function (text) { return a[text] } },
         { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
       return arr
     }

+ 2 - 2
vue.config.js

@@ -107,9 +107,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.2.10/ocs-admin',
+        target: 'http://192.168.2.132/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
-        target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
+        // target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {