代码更新报价单业务员选择，组织架构新增调整

src/Form/QuotedPrice/edit.vue

@@ -482,6 +482,7 @@ export default {
       this.form.date[1] = this.form.enddate
       this.form.discountrate = Math.round((this.form.discountrate * 100)*100)/100
       this.form.salername = this.form.leader[0].name
+      console.log(this.form,"form")
       if (this.form.quotedpricetype === '项目报价'){
         this.isQuotedPrice = true
       }else {
@@ -510,6 +511,7 @@ export default {
       })
     },
     getSubmit(){
+      console.log(this.form,'提交表单')
       if (this.form.date.length === 0){
         this.form.begdate = ''
         this.form.enddate = ''
@@ -747,7 +749,6 @@ export default {
       console.log(data,"业务员")
       this.form.saler_hrid = data[0].hrid
       this.form.salername = data[0].name
-      this.form.name = data[0].name
       this.salesmanVisible = false
 
       /*   this.form.salername = data[0].name
@@ -757,8 +758,8 @@ export default {
     async querySalesman(){
       const res = await this.$api.requested(this.salerParam)
       this.form.salername = res.data[0].name
-      this.form.name = data[0].name
       this.form.saler_hrid = res.data[0].hrid
+      console.log(this.form,"更换业务员后")
     }
    /* async mainData(val) {
       const res = await this.$api.requested({

src/Form/cashcoupon/add.vue

@@ -188,6 +188,8 @@ export default {
           this.$emit('onSuccess')
           this.dialogFormVisible = false
           this.$refs.form.resetFields()
+          this.$store.dispatch('changeDetailDrawer',true)
+          this.$router.push({path:'/cashcouponDetail',query:{id:res.data.sa_cashbillid,rowindex:res.data.rowindex}})
         })
       })
     },

src/HDrpManagement/ProductMag/index.vue

@@ -79,7 +79,7 @@
         <p v-else-if="scope.data.column.columnname === 'itemclass'">
         <span v-if="JSON.stringify(scope.data.column.data.itemclass) !== '[]' && scope.data.column.data.itemclass">
            <span v-for="item in scope.data.column.data.itemclass" :key="item.index">
-             <el-tag style="margin-right: 10px;margin-top: 5px;margin-bottom: 5px" type="success">{{item.itemclassname}}</el-tag>
+             <el-tag style="margin-right: 10px;margin-top: 5px;margin-bottom: 5px" type="success">{{item.itemclassfullname}}</el-tag>
           </span>
         </span>
           <span v-else>

src/HDrpManagement/contractManage/components/editContract.vue

@@ -713,6 +713,7 @@ export default {
       this.form.orderratio === 0 ? this.form.orderratio = '' : this.form.orderratio = Math.round((this.form.orderratio * 100) * 100)/100
       this.form.discountrate === 0 ? this.form.discountrate = '' : this.form.discountrate = Math.round((this.form.discountrate * 100) * 100)/100
       this.address = this.form.province + this.form.city + this.form.county + this.form.address
+      this.form.salername = this.form.leader[0].name
       this.drawer = true
       this.$nextTick(() => {
         this.$refs.timeSelect.time = [this.form.begdate,this.form.enddate]
@@ -860,7 +861,7 @@ export default {
       this.concratVisible = false
       this.receiptVisible = false
       this.salesmanVisible = false
-      this.$refs.form.resetFlieds()
+      // this.$refs.form.resetFlieds()
     },
     agentChange (data) {
       this.form.sys_enterpriseid = data[0].sys_enterpriseid

src/HDrpManagement/contractManage/modules/detail.vue

@@ -12,7 +12,7 @@
 
         :statusCheck="[{key:'status',value:'已提交'},{key:'status',value:'审核'},{key:'status',value:'已终止'}]"
         @pageChange="pageChange"
-        @onEditSuccess="queryMainData($route.query.id)">
+        @onEditSuccess="editSuccess">
       <div slot="tags">
       </div>
       <div slot="customOperation">
@@ -229,7 +229,11 @@ export default {
     }
   },
   methods:{
+    editSuccess(){
+      this.queryMainData(this.$route.query.id)
+    },
     async queryMainData(id) {
+      this.$refs.details.$refs.group.queryGroup()
       const res = await this.$api.requested({
         "id":20221121195102,
         "content": {

src/HDrpManagement/logistics/modules/defaultInfo.vue

@@ -9,7 +9,7 @@
     </el-descriptions>
     <el-descriptions  border :column="2" labelClassName="my-label" contentClassName="my-content">
       <div slot="title" class="my-label__title">物流信息</div>
-      <el-descriptions-item label="快递公司">{{ mainData.logiscomp_enterprisename?mainData.logiscomp_enterprisename:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="快递公司">{{ mainData.logiscompname?mainData.logiscompname:"--" }}</el-descriptions-item>
       <el-descriptions-item label="快递单号">{{ mainData.logisticno?mainData.logisticno:"--" }}</el-descriptions-item>
       <el-descriptions-item :style="style(mainData.status)" label="运费状态">
         {{ mainData.paytype }}

src/HManagement/department/staff/detail/modules/createUser.vue

@@ -10,6 +10,16 @@
       <div>
         <el-row :gutter="50">
           <el-form :model="form" :rules="rules" ref="form"  size="mini" label-position="right">
+            <el-col :span="24">
+              <el-form-item label="登录账号" label-width="100px">
+                <el-input v-model="form.accountno" autocomplete="off" placeholder="请输入登录账号"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="手机号" label-width="100px">
+                <el-input v-model="form.phonenumber" autocomplete="off" placeholder="请输入手机号"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="授权角色" label-width="100px" prop="roleids">
                 <el-select v-model="form.roleids" style="width:100%" placeholder="请选择" multiple>
@@ -50,6 +60,7 @@ export default {
         "userid": 0,
         "name": "",
         "phonenumber": "",
+        "accountno":"",
         "status": 1,
         "remarks":"",
         "roleids":[]
@@ -87,6 +98,8 @@ export default {
           "classname": "webmanage.hr.hr",
           "method": "createUser",
           "content": {
+            "phonenumber":this.form.phonenumber,
+            "accountno":this.form.accountno,
             "hrid":this.$route.query.id,
             "roleids":this.form.roleids
           }

src/HManagement/department/staff/list/modules/add.vue

@@ -1,7 +1,7 @@
 <template>
 <div>
   <el-button type="primary" size="small" icon="el-icon-plus" @click="onShow">新建员工</el-button>
-  <el-drawer title="新建员工" direction="rtl" append-to-body :visible.sync="dialogFormVisible" size="800px" @close="$refs.form.clearValidate()">
+  <el-drawer title="新建员工" direction="rtl" append-to-body :visible.sync="dialogFormVisible" size="800px" @close="$refs.form.clearValidate()" :show-close="false">
     <div class="drawer__panel">
       <el-row :gutter="20">
         <el-form :model="form" size="small" :rules="rules" ref="form" label-position="right" label-width="100px">
@@ -32,11 +32,11 @@
               <el-input v-model="form.email" placeholder="输入电子邮箱" autocomplete="off"></el-input>
             </el-form-item>
           </el-col>
-          <el-col class="mb-30" :span="12">
+<!--          <el-col class="mb-30" :span="12">
             <el-form-item label="手机号码:" prop="phonenumber">
               <el-input v-model="form.phonenumber" placeholder="输入手机号码" autocomplete="off"></el-input>
             </el-form-item>
-          </el-col>
+          </el-col>-->
           <el-col class="mb-30" :span="12">
             <el-form-item label="身份证号:">
               <el-input v-model="form.idcard" placeholder="输入身份证号" autocomplete="off"></el-input>
@@ -82,12 +82,12 @@
               <selectMenber @selectMenber="selectMenber"></selectMenber>
             </el-form-item>
           </el-col>
-          <el-col class="mb-30" :span="12">
+          <el-col class="mb-30" :span="5">
             <el-form-item>
               <el-checkbox v-model="form.isleader" :false-label="0" :true-label="1">是否部门负责人</el-checkbox>
             </el-form-item>
           </el-col>
-          <el-col class="mb-30" :span="12">
+          <el-col class="mb-30" :span="5">
             <el-form-item>
               <el-checkbox v-model="form.isworker" :false-label="0" :true-label="1">是否服务人员</el-checkbox>
             </el-form-item>

src/HManagement/department/staff/list/modules/edit.vue

@@ -1,7 +1,7 @@
 <template>
 <div>
   <el-button type="default" size="mini" @click="onShow">编 辑</el-button>
-  <el-drawer title="编辑员工" direction="rtl" append-to-body :visible.sync="dialogFormVisible" size="800px" @close="$refs.form.clearValidate()">
+  <el-drawer title="编辑员工" direction="rtl" append-to-body :visible.sync="dialogFormVisible" size="800px" @close="$refs.form.clearValidate()" :show-close="false">
     <div class="drawer__panel">
       <el-row :gutter="20">
         <el-form :model="form" size="small" :rules="rules" ref="form" label-position="right" label-width="100px">
@@ -32,12 +32,12 @@
               <el-input v-model="form.email" placeholder="输入电子邮箱" autocomplete="off"></el-input>
             </el-form-item>
           </el-col>
-          <el-col class="mb-30" :span="12">
+<!--          <el-col class="mb-30" :span="12">
             <el-form-item label="手机号码:" prop="phonenumber">
               <el-input v-if="form.accountno === ''" v-model="form.phonenumber" placeholder="输入手机号码" autocomplete="off" ></el-input>
               <el-input v-else v-model="form.userphonenumber" placeholder="输入手机号码" autocomplete="off" disabled></el-input>
             </el-form-item>
-          </el-col>
+          </el-col>-->
           <el-col class="mb-30" :span="12">
             <el-form-item label="身份证号:">
               <el-input v-model="form.idcard" placeholder="输入身份证号" autocomplete="off"></el-input>
@@ -83,12 +83,12 @@
               <selectMenber @selectMenber="selectMenber"></selectMenber>
             </el-form-item>
           </el-col>
-          <el-col class="mb-30" :span="12">
+          <el-col class="mb-30" :span="5">
             <el-form-item>
               <el-checkbox v-model="form.isleader" :false-label="0" :true-label="1">是否部门负责人</el-checkbox>
             </el-form-item>
           </el-col>
-          <el-col class="mb-30" :span="12">
+          <el-col class="mb-30" :span="5">
             <el-form-item>
               <el-checkbox v-model="form.isworker" :false-label="0" :true-label="1">是否服务人员</el-checkbox>
             </el-form-item>

src/SDrpManagement/QuotedPrice/detail/index.vue

@@ -130,6 +130,7 @@ export default {
   },
   methods:{
     async queryMainData(id){
+      this.$refs.details.$refs.group.queryGroup()
       const res = await this.$api.requested({
         "id": 20221020165203,
         "version":1,

src/SDrpManagement/QuotedPrice/detail/modules/productInventory/index.vue

@@ -39,6 +39,92 @@
             </div>
           </template>
         </el-table-column>
+        <el-table-column
+            prop="num"
+            label="数量"
+            width="160"
+        >
+          <template slot-scope="scope">
+            <span>
+              <el-input-number :disabled="!saveShow || index !== scope.row.rowindex" v-model="scope.row.qty" size="mini"  :min="1" label="描述文字" @change="onChangeNum(scope.row.qty,scope.row,scope.$index)"></el-input-number>
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column
+            prop="marketprice"
+            label="牌价"
+            width="80"
+        >
+          <template slot-scope="scope">
+            <p><span>{{scope.row.marketprice?scope.row.marketprice:'--'}}</span></p>
+          </template>
+        </el-table-column>
+        <el-table-column
+            prop="discountrate"
+            label="折扣(%)"
+            width="80"
+        >
+          <template slot-scope="scope">
+            <div v-if="scope.row.discountDifferenceAmount > 0 ">
+              <p v-if="!saveShow || index !== scope.row.rowindex"><span :style="[setTopColor]">{{scope.row.discountrate}}</span></p>
+              <span v-if="saveShow && index === scope.row.rowindex">
+                 <el-input v-model="scope.row.discountrate" size="mini" placeholder="请输入折扣" @change="onChangeDiscountrate(scope.row.discountrate,scope.row,scope.$index)"></el-input>
+              </span>
+            </div>
+            <div v-else-if="scope.row.discountDifferenceAmount < 0 ">
+              <p v-if="!saveShow || index !== scope.row.rowindex"><span :style="[setDownColor]">{{scope.row.discountrate}}</span></p>
+              <span v-if="saveShow && index === scope.row.rowindex">
+                 <el-input v-model="scope.row.discountrate" size="mini" placeholder="请输入折扣" @change="onChangeDiscountrate(scope.row.discountrate,scope.row,scope.$index)"></el-input>
+              </span>
+            </div>
+            <span v-else>
+              <span v-if="saveShow && index === scope.row.rowindex">
+                 <el-input v-model="scope.row.discountrate" size="mini" placeholder="请输入折扣" @change="onChangeDiscountrate(scope.row.discountrate,scope.row,scope.$index)"></el-input>
+              </span>
+              <span v-else>
+                <span >{{tool.formatAmount(scope.row.discountrate,2)}}</span>
+              </span>
+
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column
+            prop="price"
+            label="单价"
+            width="80"
+        >
+          <template slot-scope="scope">
+            <div v-if="scope.row.discountDifferenceAmount > 0 ">
+              <p v-if="!saveShow || index !== scope.row.rowindex"><span :style="[setTopColor]">{{tool.formatAmount(scope.row.price,2)}}</span></p>
+              <span v-if="saveShow && index === scope.row.rowindex">
+                <el-input v-model="scope.row.price" size="mini" placeholder="请输入单价" @change="onChangePrice(scope.row.price,scope.row,scope.$index)"></el-input>
+              </span>
+            </div>
+            <div v-else-if="scope.row.discountDifferenceAmount < 0 " >
+              <p v-if="!saveShow || index !== scope.row.rowindex"><span :style="[setDownColor]">{{tool.formatAmount(scope.row.price,2)}}</span></p>
+              <span v-if="saveShow && index === scope.row.rowindex">
+                <el-input v-model="scope.row.price" size="mini" placeholder="请输入单价" @change="onChangePrice(scope.row.price,scope.row,scope.$index)"></el-input>
+              </span>
+            </div>
+            <span v-else>
+              <span v-if="saveShow && index === scope.row.rowindex">
+                <el-input v-model="scope.row.price" size="mini" placeholder="请输入单价" @change="onChangePrice(scope.row.price,scope.row,scope.$index)"></el-input>
+              </span>
+               <span v-else>
+                <span >{{tool.formatAmount(scope.row.price,2)}}</span>
+              </span>
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column
+            prop="discountDifferenceAmount"
+            label="单价差额（元）"
+            width="80"
+        >
+          <template slot-scope="scope">
+            <p><span>{{scope.row.discountDifferenceAmount}}</span></p>
+          </template>
+        </el-table-column>
         <el-table-column
             prop="itemno"
             label="产品编号"
@@ -141,55 +227,7 @@
             <el-tag size="mini" type="info" effect="plain">{{scope.row.unitname}}/{{scope.row.axunitname}}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column
-            prop="num"
-            label="数量"
-            width="160"
-           >
-          <template slot-scope="scope">
-            <span>
-              <el-input-number :disabled="!saveShow || index !== scope.row.rowindex" v-model="scope.row.qty" size="mini"  :min="1" label="描述文字" @change="onChangeNum(scope.row.qty,scope.row,scope.$index)"></el-input-number>
-            </span>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="marketprice"
-            label="牌价"
-            width="80"
-            >
-          <template slot-scope="scope">
-            <p><span>{{scope.row.marketprice?scope.row.marketprice:'--'}}</span></p>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="discountrate"
-            label="折扣(%)"
-            width="80"
-            >
-          <template slot-scope="scope">
-            <div v-if="scope.row.discountDifferenceAmount > 0 ">
-              <p v-if="!saveShow || index !== scope.row.rowindex"><span :style="[setTopColor]">{{scope.row.discountrate}}</span></p>
-              <span v-if="saveShow && index === scope.row.rowindex">
-                 <el-input v-model="scope.row.discountrate" size="mini" placeholder="请输入折扣" @change="onChangeDiscountrate(scope.row.discountrate,scope.row,scope.$index)"></el-input>
-              </span>
-            </div>
-            <div v-else-if="scope.row.discountDifferenceAmount < 0 ">
-              <p v-if="!saveShow || index !== scope.row.rowindex"><span :style="[setDownColor]">{{scope.row.discountrate}}</span></p>
-              <span v-if="saveShow && index === scope.row.rowindex">
-                 <el-input v-model="scope.row.discountrate" size="mini" placeholder="请输入折扣" @change="onChangeDiscountrate(scope.row.discountrate,scope.row,scope.$index)"></el-input>
-              </span>
-            </div>
-            <span v-else>
-              <span v-if="saveShow && index === scope.row.rowindex">
-                 <el-input v-model="scope.row.discountrate" size="mini" placeholder="请输入折扣" @change="onChangeDiscountrate(scope.row.discountrate,scope.row,scope.$index)"></el-input>
-              </span>
-              <span v-else>
-                <span >{{tool.formatAmount(scope.row.discountrate,2)}}</span>
-              </span>
 
-            </span>
-          </template>
-        </el-table-column>
         <el-table-column
             prop="mindiscountrate"
             label="最低授权折扣(%)"
@@ -199,43 +237,7 @@
             <p><span>{{scope.row.mindiscountrate}}</span></p>
           </template>
         </el-table-column>
-        <el-table-column
-            prop="price"
-            label="单价"
-            width="80"
-           >
-          <template slot-scope="scope">
-            <div v-if="scope.row.discountDifferenceAmount > 0 ">
-              <p v-if="!saveShow || index !== scope.row.rowindex"><span :style="[setTopColor]">{{tool.formatAmount(scope.row.price,2)}}</span></p>
-              <span v-if="saveShow && index === scope.row.rowindex">
-                <el-input v-model="scope.row.price" size="mini" placeholder="请输入单价" @change="onChangePrice(scope.row.price,scope.row,scope.$index)"></el-input>
-              </span>
-            </div>
-            <div v-else-if="scope.row.discountDifferenceAmount < 0 " >
-              <p v-if="!saveShow || index !== scope.row.rowindex"><span :style="[setDownColor]">{{tool.formatAmount(scope.row.price,2)}}</span></p>
-              <span v-if="saveShow && index === scope.row.rowindex">
-                <el-input v-model="scope.row.price" size="mini" placeholder="请输入单价" @change="onChangePrice(scope.row.price,scope.row,scope.$index)"></el-input>
-              </span>
-            </div>
-            <span v-else>
-              <span v-if="saveShow && index === scope.row.rowindex">
-                <el-input v-model="scope.row.price" size="mini" placeholder="请输入单价" @change="onChangePrice(scope.row.price,scope.row,scope.$index)"></el-input>
-              </span>
-               <span v-else>
-                <span >{{tool.formatAmount(scope.row.price,2)}}</span>
-              </span>
-            </span>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="discountDifferenceAmount"
-            label="授权折扣差额"
-            width="80"
-            >
-          <template slot-scope="scope">
-            <p><span>{{scope.row.discountDifferenceAmount}}</span></p>
-          </template>
-        </el-table-column>
+
         <el-table-column
             prop="amount"
             label="金额"

src/SManagement/orderclue/components/selectActivity/selectActivity.vue

@@ -67,7 +67,7 @@ export default {
           "pageSize":20,
           "type":1,
           "where": {
-            /*"unend":1,*/
+            "unend":1,
             'condition':''
           }
         }

src/components/normal-basic-layout/details/modules/group/group.vue

@@ -112,7 +112,8 @@ export default {
   },
   methods:{
     async queryGroup () {
-      console.log(this.justsaler)
+      console.log(this.justsaler,'----')
+      this.list = []
       /*this.param.content.where.justsaler = this.justsaler?this.justsaler:0*/
       const res = await this.$api.requested({
         "id": 20220930103501,
@@ -121,7 +122,7 @@ export default {
           "ownerid":this.$route.query.id
         }
       })
-      res.data.length > 0?this.list = res.data:this. list=[
+      res.data.length > 0?this.list = res.data:this.list=[
         {
           ismyteam:1,
           team:[],

src/components/productTable/indexQty.vue

@@ -21,6 +21,67 @@
           </div>
         </template>
       </el-table-column>
+      <el-table-column
+          prop="qty"
+          label="数量"
+
+          width="100">
+        <template slot-scope="scope">
+          <span >{{scope.row.qty?scope.row.qty:'--'}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+          prop="marketprice"
+
+          label="牌价"
+          width="100">
+        <template slot-scope="scope">
+          <span >{{scope.row.marketprice?scope.row.marketprice:'--'}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+          prop="discountrate"
+
+          label="折扣(%)"
+          width="80">
+        <template slot-scope="scope">
+          <div v-if="scope.row.discountDifferenceAmount > 0">
+            <p><span :style="[setTopColor]">{{Math.round((scope.row.discountrate * 100) * 100)/100}}</span></p>
+          </div>
+          <div v-else-if="scope.row.discountDifferenceAmount < 0 ">
+            <p><span :style="[setDownColor]">{{Math.round((scope.row.discountrate * 100) * 100)/100}}</span></p>
+          </div>
+          <div v-else>
+            <p><span >{{Math.round((scope.row.discountrate * 100) * 100)/100}}</span></p>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+          prop="price"
+          label="单价"
+
+          width="80">
+        <template slot-scope="scope">
+          <div v-if="(scope.row.discountDifferenceAmount > 0)">
+            <p><span :style="[setTopColor]">{{tool.formatAmount(scope.row.price,2)}}</span></p>
+          </div>
+          <div v-else-if="(scope.row.discountDifferenceAmount < 0 )" >
+            <p><span :style="[setDownColor]">{{tool.formatAmount(scope.row.price,2)}}</span></p>
+          </div>
+          <div v-else>
+            <p><span >{{tool.formatAmount(scope.row.price,2)}}</span></p>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+          prop="discountDifferenceAmount"
+          label="单价差额（元）"
+
+          width="80">
+        <template slot-scope="scope">
+          <span >{{scope.row.discountDifferenceAmount?scope.row.discountDifferenceAmount:'--'}}</span>
+        </template>
+      </el-table-column>
       <el-table-column
           prop="itemno"
           label="产品编号"
@@ -125,41 +186,7 @@
           <el-tag size="mini" type="info" effect="plain">{{scope.row.unitname}}/{{scope.row.axunitname}}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column
-          prop="qty"
-          label="数量"
 
-          width="100">
-        <template slot-scope="scope">
-          <span >{{scope.row.qty?scope.row.qty:'--'}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-          prop="marketprice"
-
-          label="牌价"
-          width="100">
-        <template slot-scope="scope">
-          <span >{{scope.row.marketprice?scope.row.marketprice:'--'}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-          prop="discountrate"
-
-          label="折扣(%)"
-          width="80">
-        <template slot-scope="scope">
-          <div v-if="scope.row.discountDifferenceAmount > 0">
-            <p><span :style="[setTopColor]">{{Math.round((scope.row.discountrate * 100) * 100)/100}}</span></p>
-          </div>
-          <div v-else-if="scope.row.discountDifferenceAmount < 0 ">
-            <p><span :style="[setDownColor]">{{Math.round((scope.row.discountrate * 100) * 100)/100}}</span></p>
-          </div>
-          <div v-else>
-            <p><span >{{Math.round((scope.row.discountrate * 100) * 100)/100}}</span></p>
-          </div>
-        </template>
-      </el-table-column>
       <el-table-column
           prop="mindiscountrate"
           label="最低授权折扣(%)"
@@ -169,32 +196,7 @@
           <span >{{scope.row.mindiscountrate?Math.round((scope.row.mindiscountrate * 100) * 100)/100:'--'}}</span>
         </template>
       </el-table-column>
-      <el-table-column
-          prop="price"
-          label="单价"
 
-          width="80">
-        <template slot-scope="scope">
-          <div v-if="(scope.row.discountDifferenceAmount > 0)">
-            <p><span :style="[setTopColor]">{{tool.formatAmount(scope.row.price,2)}}</span></p>
-          </div>
-          <div v-else-if="(scope.row.discountDifferenceAmount < 0 )" >
-            <p><span :style="[setDownColor]">{{tool.formatAmount(scope.row.price,2)}}</span></p>
-          </div>
-          <div v-else>
-            <p><span >{{tool.formatAmount(scope.row.price,2)}}</span></p>
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-          prop="discountDifferenceAmount"
-          label="授权折扣差额"
-
-          width="80">
-        <template slot-scope="scope">
-          <span >{{scope.row.discountDifferenceAmount?scope.row.discountDifferenceAmount:'--'}}</span>
-        </template>
-      </el-table-column>
       <el-table-column
           prop="amount"
           label="金额"

vue.config.js

@@ -14,8 +14,8 @@ module.exports = {
       port: 8000,
       proxy: {
         '/apis': {
-          // target: 'http://61.164.207.46:8000',  // target host*/
-          target: 'https://oms.idcgroup.com.cn:8079/',  // target host
+          target: 'http://61.164.207.46:8000',  // 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