暂存

src/HDrpManagement/afterSalesmag/index.vue

@@ -59,6 +59,9 @@
         <div v-else-if="scope.data.column.columnname == 'isitemreturn'">
           <span>{{scope.data.column.data[[scope.data.column.columnname]] ? '是' : '否'}}</span>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'returnamount'">
+          {{ tool.formatAmount(scope.data.column.data.returnamount,2) }}
+        </div>
         <span v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]}}
         </span>

src/HDrpManagement/aftersalesBill/index.vue

@@ -59,6 +59,9 @@
         <div v-else-if="scope.data.column.columnname == 'isitemreturn'">
           <span>{{scope.data.column.data[[scope.data.column.columnname]] ? '是' : '否'}}</span>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'returnamount'">
+          {{ tool.formatAmount(scope.data.column.data.returnamount,2) }}
+        </div>
         <span v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]}}
         </span>

src/HDrpManagement/dispatch/index.vue

@@ -37,6 +37,9 @@
             <span style="color:#3874f6" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '复核'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
             <span style="color:#b2c0ea" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '关闭'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
           </div>
+          <div v-else-if="scope.data.column.columnname == 'sumamount'">
+            {{ tool.formatAmount(scope.data.column.data.sumamount,2) }}
+          </div>
           <div v-else>
             {{scope.data.column.data[[scope.data.column.columnname]]}}
           </div>

src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -9,7 +9,7 @@
       <el-table
         ref="multipleTable"
         :data="tableData"
-        style="width: 100%;"
+        style="width: 100%;height:calc(100vh - 410px)"
         size="small"
         stripe
         border

src/HDrpManagement/orderManage/index.vue

@@ -104,10 +104,16 @@
           <span style="color:#b2c0ea" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '关闭'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname == 'ischange'">
-          {{ +scope.data.column.data.ischange ? '是' : '否' }}
+          {{ scope.data.column.data.ischange ? '是' : '否' }}
         </div>
         <div v-else-if="scope.data.column.columnname == 'isreturn'">
-          {{ +scope.data.column.data.isreturn ? '是' : '否' }}
+          {{ scope.data.column.data.isreturn ? '是' : '否' }}
+        </div>
+        <div v-else-if="scope.data.column.columnname == 'amount'">
+          {{ tool.formatAmount(scope.data.column.data.amount,2) }}
+        </div>
+        <div v-else-if="scope.data.column.columnname == 'defaultamount'">
+          {{ tool.formatAmount(scope.data.column.data.defaultamount,2) }}
         </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}

src/HDrpManagement/toolBill/index.vue

@@ -52,6 +52,9 @@
         <div v-else-if="scope.data.column.columnname == 'isitemreturn'">
           <span>{{scope.data.column.data[[scope.data.column.columnname]] ? '是' : '否'}}</span>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'returnamount'">
+          {{ tool.formatAmount(scope.data.column.data.returnamount,2) }}
+        </div>
         <span v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]}}
         </span>

src/HDrpManagement/toolBillMag/index.vue

@@ -52,6 +52,9 @@
         <div v-else-if="scope.data.column.columnname == 'isitemreturn'">
           <span>{{scope.data.column.data[[scope.data.column.columnname]] ? '是' : '否'}}</span>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'returnamount'">
+          {{ tool.formatAmount(scope.data.column.data.returnamount,2) }}
+        </div>
         <span v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]}}
         </span>

src/HDrpManagement/toolBorrowingMag/index.vue

@@ -42,6 +42,9 @@
         <div v-else-if="scope.data.column.columnname === 'address'">
           {{scope.data.column.data.province}}{{scope.data.column.data.city}}{{scope.data.column.data.county}}{{scope.data.column.data.address}}
         </div>
+        <div v-else-if="scope.data.column.columnname == 'amount'">
+          {{ tool.formatAmount(scope.data.column.data.amount,2) }}
+        </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]}}
         </div>

src/SDrpManagement/ProductGroup/modules/Select.vue

@@ -68,7 +68,8 @@ export default {
         }
       })
       this.brands = res.data
-      this.brand_act = 0
+      this.brand_act = res.data[0].sa_brandid
+      this.clickBrand(res.data[0].sa_brandid)
     },
 
     async queryClass () {

src/SDrpManagement/Products/modules/Select.vue

@@ -68,7 +68,8 @@ export default {
         }
       })
       this.brands = res.data
-      this.brand_act = 0
+      this.brand_act = res.data[0].sa_brandid
+      this.clickBrand(res.data[0].sa_brandid)
     },
 
     async queryClass () {

src/SDrpManagement/agentOrder/index.vue

@@ -58,6 +58,12 @@
           <span style="color:#52C41A" v-if="scope.data.column.data[[scope.data.column.columnname]] == '审核'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
           <span style="color:#b2c0ea" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '关闭'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'amount'">
+          {{ tool.formatAmount(scope.data.column.data.amount,2) }}
+        </div>
+        <div v-else-if="scope.data.column.columnname == 'defaultamount'">
+          {{ tool.formatAmount(scope.data.column.data.defaultamount,2) }}
+        </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]}}
         </div>

src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -7,7 +7,7 @@
       ref="multipleTable"
       :data="tableData"
       height="500px"
-      style="width: 100%;"
+      style="width: 100%;height:calc(100vh - 410px)"
       size="small"
       stripe
       border>

src/SDrpManagement/salerOrder/index.vue

@@ -57,6 +57,12 @@
           <span style="color:#52C41A" v-if="scope.data.column.data[[scope.data.column.columnname]] == '审核'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
           <span style="color:#b2c0ea" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '关闭'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'amount'">
+          {{ tool.formatAmount(scope.data.column.data.amount,2) }}
+        </div>
+        <div v-else-if="scope.data.column.columnname == 'defaultamount'">
+          {{ tool.formatAmount(scope.data.column.data.defaultamount,2) }}
+        </div>
         <div v-else-if="scope.data.column.columnname=='address'">
           {{`${scope.data.column.data.province}-${scope.data.column.data.city}-${scope.data.column.data.county}-${scope.data.column.data.address}`}}
         </div>

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -7,7 +7,7 @@
       ref="multipleTable"
       :data="tableData"
       height="500px"
-      style="width: 100%;"
+      style="width: 100%;height:calc(100vh - 410px)"
       size="small"
       stripe
       border>

src/SDrpManagement/toolBorrowing/index.vue

@@ -42,6 +42,9 @@
           <span style="color:#52C41A" v-if="scope.data.column.data[[scope.data.column.columnname]] == '审核'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
           <span style="color:#b2c0ea" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '关闭'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'amount'">
+          {{ tool.formatAmount(scope.data.column.data.amount,2) }}
+        </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]}}
         </div>

src/main.js

@@ -58,6 +58,8 @@ Vue.component('sort', sort)
 Vue.component('tagPanl',tagPanl)
 
 Vue.use(ElementUI);
+ElementUI.TableColumn.props.showOverflowTooltip ={type:Boolean, default: true}
+
 ElementUI.Dialog.props.closeOnClickModal.default = false; 
 
 new Vue({

vue.config.js

@@ -14,8 +14,8 @@ module.exports = {
       port: 8000,
       proxy: {
         '/apis': {
-          target: 'http://61.164.207.46:8000',  // target host*/
-          /*target: 'http://122.226.136.204:8082/',  // target host*/
+          // target: 'http://61.164.207.46:8000',  // target host*/
+          target: 'https://122.226.136.204:8079/',  // target host*/
           // target: 'localhost:8080',  // target host
           ws: true,  // proxy websockets 
           changeOrigin: true,  // needed for virtual hosted sites