报价单调整

src/Form/QuotedPrice/edit.vue

@@ -264,11 +264,11 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col  :span="24">
+<!--            <el-col  :span="24">
               <el-form-item label="折扣(%):" label-width="100px" prop="discountrate">
                 <el-input type="number"  v-model="form.discountrate" autocomplete="off" placeholder="请输入0-100%"  @change="discountrateChange"></el-input>
               </el-form-item>
-            </el-col>
+            </el-col>-->
             <el-col  :span="24">
               <el-form-item label="业务员:" label-width="100px" prop="salername">
                 <el-popover

src/HDrpManagement/projectChange/modules/modules/productSet/index.vue

@@ -8,7 +8,7 @@
                   @addSuccess="addProducts" :discountrate="discountrate" @addProduct="addProduct" :tablecolsAdd="tablecolsAdd"
       ></addProduct>
       <uploadAllData
-          v-if="tool.checkAuth($route.name,'productSetManage') && data.disabled && flagTag ===0"
+          v-if="tool.checkAuth($route.name,'productSetManage') && data.disabled "
           class="inline-16"
           :total="total"
           @onSuccess="listData()"
@@ -17,7 +17,7 @@
           idName="sa_project_itemsid"
           type="del"
       ></uploadAllData>
-      <el-button  v-if="tool.checkAuth($route.name,'productSetManage') && data.disabled && flagTag ===0 " class="inline-16" size="small" :type="delProductData.length === 0?'':'primary'" @click="onDelProduct" :disabled="delProductData.length === 0">删 除</el-button>
+      <el-button  v-if="tool.checkAuth($route.name,'productSetManage') && data.disabled  " class="inline-16" size="small" :type="delProductData.length === 0?'':'primary'" @click="onDelProduct" :disabled="delProductData.length === 0">删 除</el-button>
       <el-input
           size="small"
           style="width: 200px;"
@@ -29,17 +29,17 @@
           clearable></el-input>&nbsp;
       <div style="float: right">
         <label class="search__label">预计折扣(%):</label>
-        <el-input style="width: 100px;" v-model="discountrate" size="small"   label="默认折扣"  :disabled="!tool.checkAuth($route.name,'productSetManage') || !data.disabled || flagTag !==0" @change="discountrateChange(discountrate)"></el-input>
+        <el-input style="width: 100px;" v-model="discountrate" size="small"   label="默认折扣"  :disabled="!tool.checkAuth($route.name,'productSetManage') || !data.disabled " @change="discountrateChange(discountrate)"></el-input>
       </div>
     </div>
     <div class="produtMag-panel">
       <tableLayout :layout="tablecols" checkbox="true"  :data="list" :opwidth="200" height="calc(100vh - 550px)" :width="true" :custom="true" fixedName="amount" @selectionChange="selectionChange">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname == 'qty'">
-            <el-input-number v-model="scope.column.data.qty" size="mini" :min="1"  label="描述文字" @change="numChange(scope.column.data.qty,scope.$index,scope.column.data)" :disabled="!disabled || !tool.checkAuth($route.name,'productSetManage') || flagTag !==0 "></el-input-number>
+            <el-input-number v-model="scope.column.data.qty" size="mini" :min="1"  label="描述文字" @change="numChange(scope.column.data.qty,scope.$index,scope.column.data)" :disabled="!disabled || !tool.checkAuth($route.name,'productSetManage')  "></el-input-number>
           </div>
           <div v-else-if="scope.column.columnname == 'price'">
-            <el-input v-model="scope.column.data.price" size="mini"    @change="priceChange(scope.column.data.price,scope.$index,scope.column.data)" :disabled="!disabled || !tool.checkAuth($route.name,'productSetManage') || flagTag !==0 "></el-input>
+            <el-input v-model="scope.column.data.price" size="mini"    @change="priceChange(scope.column.data.price,scope.$index,scope.column.data)" :disabled="!disabled || !tool.checkAuth($route.name,'productSetManage') "></el-input>
           </div>
           <div v-else-if="scope.column.columnname == 'marketprice'">
             <p>{{tool.formatAmount((scope.column.data.marketprice),2)}}</p>

src/SDrpManagement/QuotedPrice/detail/index.vue

@@ -67,9 +67,11 @@ export default {
   name: "index",
   data(){
     return {
-      mainData:{
+      mainData:[],
+      disabledFlag:{
         disabled:true,
       },
+      mainDataNew:[],
       mainAreaData:[],
       disabled:false,
       flag:false,
@@ -106,7 +108,7 @@ export default {
       if (this.mainData.leader.length !== 0){
         if (JSON.parse(window.sessionStorage.getItem('active_account')).userid === this.mainData.leader[0].userid){
 
-          this.mainData.disabled = true
+          this.disabledFlag.disabled = true
         }else {
           let flag = 0
           for (var i=0;i<res.data[0].team.length;i++){
@@ -122,10 +124,10 @@ export default {
             }
           }
           /*不是负责人*/
-          flag === 0?this.mainData.disabled = false:this.mainData.disabled = true
+          flag === 0?this.disabledFlag.disabled = false:this.disabledFlag.disabled = true
         }
       }
-      console.log("权限结果",this.mainData.disabled)
+      console.log("权限结果",this.disabledFlag.disabled)
     }
   },
   methods:{
@@ -133,14 +135,15 @@ export default {
       this.$refs.details.$refs.group.queryGroup()
       const res = await this.$api.requested({
         "id": 20221020165203,
-        "version":1,
         "content": {
           nocache:true,
-          "sa_quotedpriceid":id
+          "sa_quotedpriceid":this.$route.query.id
         }
       })
       /*this.mainData = res.data*/
-      this.mainData = Object.assign({},this.mainData,res.data)
+      this.mainData = res.data
+      this.mainDataNew = res.data
+      this.mainData = Object.assign({},this.mainData,this.disabledFlag)
       this.productList()
       /*this.$refs.productList.productData()*/
       this.$nextTick(()=>{
@@ -196,17 +199,17 @@ export default {
           value:this.mainData.contactsphonenumber
         },
         {
-          label:'折扣(%)',
+          label:'整单折扣(%)',
           value:this.mainData.discountrate !== 0?Math.round((this.mainData.discountrate * 100)*100)/100:'--'
         },
         {
           label:'总金额(元)',
-          value:this.totalPrice ? this.tool.formatAmount(this.totalPrice,2) : '--'
+          value:this.mainData.sumamount ? this.tool.formatAmount(this.mainData.sumamount,2) : '--'
         },
 
         {
           label:'是否特价',
-          value:this.mainData.specialoffer === 1?'是':'否'
+          value:this.mainDataNew.specialoffer?'是':'否'
         },
         {
           label:'状态',
@@ -261,12 +264,12 @@ export default {
               value:this.mainData.contactsphonenumber
             },
             {
-              label:'折扣(%)',
+              label:'整单折扣(%)',
               value:this.mainData.discountrate !== 0?Math.round((this.mainData.discountrate * 100)*100)/100:'--'
             },
             {
               label:'总金额(元)',
-              value:this.totalPrice ? this.tool.formatAmount(this.totalPrice,2) : '--'
+              value:this.mainData.sumamount ? this.tool.formatAmount(this.mainData.sumamount,2) : '--'
             },
 
             {
@@ -305,21 +308,15 @@ export default {
     /*产品配置信息*/
     async productList(){
       const res = await this.$api.requested({
-        "id": 20221021095503,
+        "id": 20221020165203,
         "content": {
-          "sa_quotedpriceid":this.$route.query.id     //sat_notice_classid<=0时 为新增
-        }
-      })
-      this.totalPrice = 0
-      this.mainData.specialoffer = 0
-      res.data.forEach((item)=> {
-        if (item.discountDifferenceAmount < 0){
-          this.mainData.specialoffer = 1
+          nocache:true,
+          "sa_quotedpriceid":this.$route.query.id
         }
-        this.totalPrice = this.totalPrice + item.amount
       })
-      /*this.queryMainData(this.$route.query.id)*/
-      this.totalPrice = Math.round(this.totalPrice * 100) / 100
+      this.mainData = res.data
+      this.mainDataNew = res.data
+      this.mainData = Object.assign({},this.mainData,this.disabledFlag)
       this.changeDataStructure()
     },
     onSuccess(){
@@ -327,7 +324,6 @@ export default {
 
     },
     productSuccess(){
-      /*this.queryMainData(this.$route.query.id)*/
       this.productList()
     }
 

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

@@ -50,15 +50,15 @@
             <el-input :disabled="data.status !== '新建' || !tool.checkAuth($route.name,'productDetails') || !disabled"  v-model="scope.column.data.price" size="mini" placeholder="请输入单价" @change="onChangePrice(scope.column.data.price,scope.column.data,scope.$index)"></el-input>
           </div>
           <div v-else-if="scope.column.columnname == 'offerPrice'">
-            <span v-if="scope.column.data.discountDifferenceAmount < 0" style="color: red">是</span>
+            <span v-if="scope.column.data.specialoffer === 1" style="color: red">是</span>
             <span v-else>否</span>
           </div>
           <div v-else-if="scope.column.columnname == 'amount'">
-            <span v-if="scope.column.data.discountDifferenceAmount < 0" style="color: red">{{tool.formatAmount(scope.column.data.amount,2)}}</span>
+            <span v-if="scope.column.data.specialoffer === 1" style="color: red">{{tool.formatAmount(scope.column.data.amount,2)}}</span>
             <span v-else style="color: #5daf34">{{tool.formatAmount(scope.column.data.amount,2)}}</span>
           </div>
           <div v-else-if="scope.column.columnname == 'discountDifferenceAmount'">
-            <span v-if="scope.column.data.discountDifferenceAmount < 0" style="color: red">{{tool.formatAmount(scope.column.data.discountDifferenceAmount,2)}}</span>
+            <span v-if="scope.column.data.specialoffer === 1" style="color: red">{{tool.formatAmount(scope.column.data.discountDifferenceAmount,2)}}</span>
             <span v-else style="color: #5daf34">{{tool.formatAmount(scope.column.data.discountDifferenceAmount,2)}}</span>
           </div>
           <div v-else-if="scope.column.columnname == 'marketprice'">
@@ -68,7 +68,7 @@
         </template>
       </tableLayout>
       <div style="height: 35px;margin-top: 20px">
-        <div style="float: left">总金额(元)：{{ tool.formatAmount(totalPrice,2) }}</div>
+        <div style="float: left">总金额(元)：{{ tool.formatAmount(data.sumamount,2) }}</div>
         <div style="float: right">
           <el-pagination
               background

src/SDrpManagement/QuotedPrice/modules/ProjectQuotationAdd.vue

@@ -263,11 +263,11 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col  :span="24">
+<!--            <el-col  :span="24">
               <el-form-item label="折扣(%):" label-width="100px" prop="discountrate">
                 <el-input type="number" v-model="form.discountrate" autocomplete="off" placeholder="请输入0-100%"  @change="discountrateChange"></el-input>
               </el-form-item>
-            </el-col>
+            </el-col>-->
             <el-col  :span="24">
               <el-form-item label="业务员:" label-width="100px" prop="salername">
                 <el-popover

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

@@ -196,6 +196,7 @@ export default {
       let team = data.filter(e=>{
         return e.isleader !== 1
       })
+      console.log(team,'team')
       if (team.length === 0) return true
     },
     setClick(row){

src/template/addProductContract/index.vue

@@ -99,7 +99,7 @@
           <tableTemp :data="list" :layout="tablecolsAdd" :opwidth="200" :custom="true" height="calc(100vh - 370px)" @checkboxCallBack="checkboxCallBack" fixedName="amount,isoffer,operation">
             <template v-slot:customcol="scope">
               <div v-if="scope.column.columnname === 'discountrate'">
-                <span v-if="scope.column.data.discountDifferenceAmount < 0" style="color: red">
+                <span v-if="scope.column.data.specialoffer === 1" style="color: red">
                   {{Math.round(((scope.column.data[scope.column.columnname])*100)*100)/100}}
                 </span>
                 <span v-else style="color: #44d50c">
@@ -113,7 +113,7 @@
                 <span>{{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}</span>
               </div>
               <div v-else-if="scope.column.columnname === 'price'">
-                <span v-if="scope.column.data.discountDifferenceAmount < 0" style="color: red">
+                <span v-if="scope.column.data.specialoffer === 1" style="color: red">
                   {{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}
                 </span>
                 <span v-else style="color: #44d50c">
@@ -121,7 +121,7 @@
                 </span>
               </div>
               <div v-else-if="scope.column.columnname === 'discountDifferenceAmount'">
-                <span v-if="scope.column.data.discountDifferenceAmount < 0" style="color: red">
+                <span v-if="scope.column.data.specialoffer === 1" style="color: red">
                   {{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}
                 </span>
                 <span v-else style="color: #44d50c">
@@ -129,7 +129,7 @@
                 </span>
               </div>
               <div v-else-if="scope.column.columnname === 'amount'">
-                <span v-if="scope.column.data.discountDifferenceAmount < 0" style="color: red">
+                <span v-if="scope.column.data.specialoffer === 1" style="color: red">
                   {{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}
                 </span>
                 <span v-else style="color: #44d50c">
@@ -137,7 +137,7 @@
                 </span>
               </div>
               <div v-else-if="scope.column.columnname === 'isoffer'">
-                <span v-if="scope.column.data.discountDifferenceAmount < 0">
+                <span v-if="scope.column.data.specialoffer === 1">
                   <span style="color: red">
                     是
                   </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