合作伙伴更新，核销金额调整

src/HDrpManagement/writeoffbill/modules/detail.vue

@@ -110,11 +110,11 @@ export default {
         
         {
           label:'未核销金额',
-          value:this.mainData.unwriteoffamount
+          value:this.tool.formatAmount(this.mainData.unwriteoffamount,2)
         },
         {
           label:'本次核销金额',
-          value:this.mainData.writeoffamount
+          value:this.tool.formatAmount(this.mainData.writeoffamount,2)
         },
         {
           label:'创建人',
@@ -168,11 +168,11 @@ export default {
           
           {
             label:'凭证未核销金额',
-            value:this.mainData.unwriteoffamount
+            value: this.tool.formatAmount(this.mainData.unwriteoffamount,2)
           },
           {
             label:'本次核销金额',
-            value:this.mainData.writeoffamount
+            value:this.tool.formatAmount(this.mainData.writeoffamount,2)
           },
           {
             label:'创建人',

src/HDrpManagement/writeoffbill/modules/order/index.vue

@@ -20,8 +20,11 @@
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname == 'writeoffamount'">
             <el-input size="small" v-if="currentItem.sa_writeoffbill_orderid == scope.column.data.sa_writeoffbill_orderid" v-model="scope.column.data.writeoffamount"></el-input>
-            <span v-else>{{scope.column.data.writeoffamount}}</span>
+            <span v-else>{{'¥ '+ tool.formatAmount(scope.column.data.writeoffamount,2)}}</span>
           </div>
+          <span v-else-if="scope.column.columnname == 'unwriteoffamount'">
+            {{'¥ '+ tool.formatAmount(scope.column.data.unwriteoffamount,2)}}
+          </span>
           <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
           <p v-if="!scope.column.data[scope.column.columnname] && scope.column.data[scope.column.columnname] !== 0 && scope.column.columnname != 'operation'">--</p>
         </template>

src/HManagement/marketing2/agent/index.vue

@@ -49,6 +49,16 @@
             <p v-if="scope.data.column.columnname === 'province'">
               {{`${scope.data.column.data.province}-${scope.data.column.data.city}-${scope.data.column.data.county}`}}
             </p>
+            <p v-else-if="scope.data.column.columnname === 'type'">
+              <span v-for="(item,index) in scope.data.column.data.type" :key="index">
+                <span v-if="scope.data.column.data.type.length - 1 === index">
+                  {{item}}
+                </span>
+                <span v-else>
+                  {{item + ','}}
+                </span>
+              </span>
+            </p>
             <p v-else-if="scope.data.column.columnname === 'status'">
               <span style="color:#d90a0a" v-if="scope.data.column.data[[scope.data.column.columnname]] == '禁用'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
               <span style="color:#52C41A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '启用'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>

vue.config.js

@@ -15,8 +15,8 @@ module.exports = {
       proxy: {
         '/apis': {
           // target: 'http://61.164.207.46:8000',  // target host*/
-          // target: 'http://192.168.3.9:8090',  // target host*!
-          target: 'https://oms.idcgroup.com.cn:8079/',  // target host
+          target: 'http://192.168.3.9:8090',  // target host*!
+          // target: 'https://oms.idcgroup.com.cn:8079/',  // target host
           // target: 'localhost:8080',  // target host
           ws: true,  // proxy websockets 
           changeOrigin: true,  // needed for virtual hosted sites