qymljy 2 years ago
parent
commit
ed2f466a80

+ 2 - 2
src/Form/QuotedPrice/edit.vue

@@ -323,7 +323,7 @@ export default {
       primary:'primary',
       text:'',
       projectParam:{
-        "id": 20221020143502,
+        "id": 20221020143503,
         "content": {
           "pageNumber": 1,
           "pageSize": 10,
@@ -553,7 +553,7 @@ export default {
     async customerList(){
       if (this.form.quotedpricetype === '客户报价'){
         this.customerParam.content.where.sa_projectid = 0
-        this.customerParam.content.where.type = 2
+        this.customerParam.content.where.type = 7
       }else {
         this.customerParam.content.where.type = 4
         this.customerParam.content.where.sa_projectid = this.form.sa_projectid

+ 3 - 3
src/HDrpManagement/projectChange/modules/modules/contract/components/add.vue

@@ -34,7 +34,7 @@
                     trigger="manual"
                     v-model="agentVisible"
                     width="500">
-                  <selectAgent type="12" ref="member" :sa_projectid="form.sa_projectid"  :param="agentListPrams"  :radio="true" @onSelect="agentChange" @onCancel="agentVisible = false"></selectAgent>
+                  <selectAgent type="14" ref="member" :sa_projectid="form.sa_projectid"  :param="agentListPrams"  :radio="true" @onSelect="agentChange" @onCancel="agentVisible = false"></selectAgent>
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('agentVisible')" v-model="form.enterprisename"></el-input>
                 </el-popover>
               </el-form-item>
@@ -132,7 +132,7 @@
                     trigger="manual"
                     v-model="accountVisible"
                     width="500">
-                  <selectAgent type="11" ref="member" :sa_projectid="form.sa_projectid"  :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
+                  <selectAgent type="13" ref="member" :sa_projectid="form.sa_projectid"  :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('accountVisible')" v-model="form.enterprisename"></el-input>
                 </el-popover>
               </el-form-item>
@@ -246,7 +246,7 @@
                     trigger="manual"
                     v-model="agentVisible"
                     width="500">
-                  <selectAgent ref="member" type="12" :sa_projectid="form.sa_projectid"  :param="agentListPrams" :radio="true" @onSelect="centerChange" @onCancel="agentVisible = false"></selectAgent>
+                  <selectAgent ref="member" type="14" :sa_projectid="form.sa_projectid"  :param="agentListPrams" :radio="true" @onSelect="centerChange" @onCancel="agentVisible = false"></selectAgent>
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('agentVisible')" v-model="form.enterprisename"></el-input>
                 </el-popover>
               </el-form-item>

+ 12 - 2
src/HManagement/accountManage/modules/teamInformation/index.vue

@@ -9,7 +9,7 @@
           </el-input>-->
         </div>
         <div style="margin-top: 15px">
-          <tableLayout :layout="tablecols" :data="leader.list" :opwidth="200" :custom="true"  fixedName="operation">
+          <tableLayout ref="multipleTable" :layout="tablecols" :data="leader.list" :opwidth="200" :custom="true"  fixedName="operation">
             <template v-slot:customcol="scope">
               <div v-if="scope.column.columnname === 'operation'">
                 <span>{{scope.column.data[scope.column.columnname]}}</span>
@@ -39,7 +39,7 @@
       </el-tab-pane>
       <el-tab-pane label="我参与的" name="我参与的">
         <div style="margin-top: 15px">
-          <tableLayout :layout="tablecolsPartake" :data="partake.list" :opwidth="200" :custom="true"  fixedName="operation">
+          <tableLayout ref="partakeTable" :layout="tablecols" :data="partake.list" :opwidth="200" :custom="true"  fixedName="operation">
             <template v-slot:customcol="scope">
               <div v-if="scope.column.columnname === 'operation'">
                 <span>{{scope.column.data[scope.column.columnname]}}</span>
@@ -114,11 +114,21 @@ export default {
       this.leader.params.content.leaderuserid = this.$route.query.id
       const res = await this.$api.requested(this.leader.params)
       this.leader.list = res.data
+      setTimeout(() => {
+        this.$nextTick(() => {
+          this.$refs.multipleTable.$refs.table.doLayout()
+        });
+      }, 300);
     },
     /*我参与的*/
     async partakeData(){
       const res = await this.$api.requested(this.partake.params)
       this.partake.list = res.data
+      setTimeout(() => {
+        this.$nextTick(() => {
+          this.$refs.partakeTable.$refs.table.doLayout()
+        });
+      }, 300);
     },
     handleClick(){
       if (this.activeName === '我负责的'){

+ 3 - 0
src/HManagement/roleManage/modules/filteringEdit.vue

@@ -36,6 +36,9 @@
                 <p>:departmentid 登陆账号的所属部门ID,缺省值为0</p>
                 <p>:subuserids 登陆账号的下级账号ID,如[1,2,3]</p>
                 <p>:subdepartmentids 登陆账号所在部门的下级部门ID,如[1,2,3]</p>
+                <p>:hrid  人员ID</p>
+                <p>:subhrids 下级人员ID</p>
+                <p>:subsys_enterpriseids 下级企业ID</p>
               </el-form-item>
             </el-col>
           </el-form>

+ 101 - 13
src/SDrpManagement/QuotedPrice/detail/index.vue

@@ -29,10 +29,10 @@
         <toVoid class="inline-16" v-if="tool.checkAuth($route.name,'toVoid') && mainData.status === '新建'" :disabled="mainData.disabled" :data="mainData.sa_quotedpriceid" ></toVoid>
       </div>
       <div slot="slot2" class=" normal-panel">
-        <detailed :data="mainData"  v-if="flag"></detailed>
+        <detailed :data="mainData" :totalPrice="totalPrice"  v-if="flag"></detailed>
       </div>
       <div slot="slot0" class=" normal-panel">
-        <productInventory ref="productList" :data="mainData" v-if="flag" :disabled="mainData.disabled"></productInventory>
+        <productInventory ref="productList" :data="mainData" v-if="flag" :disabled="mainData.disabled" @productSuccess="productSuccess"></productInventory>
       </div>
       <div slot="slot3" class=" normal-panel">
         <otherExpenses :status="mainData.status" :data="mainData" v-if="flag"></otherExpenses>
@@ -160,19 +160,21 @@ export default {
     },
     changeDataStructure(){
       let that = this
+      this.mainData.quotedpricetype === '项目报价'?
       this.mainAreaData = [
         {
           label:'报价类型',
           value:this.mainData.quotedpricetype
         },
-        // {
-        //   label:'项目编号',
-        //   value:this.mainData.projectnum
-        // },
-        // {
-        //   label:'项目名称',
-        //   value:this.mainData.projectname
-        // },
+        {
+          label:'项目名称',
+          value:this.mainData.projectname
+        },
+        {
+          label:'项目编号',
+          value:this.mainData.projectnum
+        },
+
         {
           label:'报价日期',
           value:this.mainData.billdate
@@ -193,11 +195,15 @@ export default {
           label:'手机号',
           value:this.mainData.contactsphonenumber
         },
-
+        {
+          label:'折扣(%)',
+          value:Math.round((this.mainData.discountrate * 100)*100)/100
+        },
         {
           label:'总金额(元)',
           value:this.totalPrice
         },
+
         {
           label:'是否特价',
           value:this.mainData.specialoffer === 1?'是':'否'
@@ -229,20 +235,97 @@ export default {
           label:'邮箱',
           value:this.mainData.email
         }*/
-      ]
+      ]:this.mainAreaData = [
+            {
+              label:'报价类型',
+              value:this.mainData.quotedpricetype
+            },
+            // {
+            //   label:'项目编号',
+            //   value:this.mainData.projectnum
+            // },
+            // {
+            //   label:'项目名称',
+            //   value:this.mainData.projectname
+            // },
+            {
+              label:'报价日期',
+              value:this.mainData.billdate
+            },
+            {
+              label:'有效期',
+              value:this.mainData.begdate?this.mainData.begdate + '至' + this.mainData.enddate:"--"
+            },
+            {
+              label:'客户名称',
+              value:this.mainData.enterprisename
+            },
+            {
+              label:'联系人',
+              value:this.mainData.contactsname
+            },
+            {
+              label:'手机号',
+              value:this.mainData.contactsphonenumber
+            },
+            {
+              label:'折扣(%)',
+              value:Math.round((this.mainData.discountrate * 100)*100)/100
+            },
+            {
+              label:'总金额(元)',
+              value:this.totalPrice
+            },
+
+            {
+              label:'是否特价',
+              value:this.mainData.specialoffer === 1?'是':'否'
+            },
+            {
+              label:'状态',
+              value:this.mainData.status,
+              style:function () {
+                let style = {}
+                switch (that.mainData.status) {
+                  case '新建':
+                    style = {color:'#3874f6'}
+                    break;
+                  case '提交':
+                    style = {color:'#52c41a'}
+                    break;
+                  case '审核':
+                    style = {color:'#333333'}
+                    break;
+                  default:
+                    break;
+                }
+                return style
+
+              }
+            },
+
+            /*{
+              label:'邮箱',
+              value:this.mainData.email
+            }*/
+          ]
     },
     /*产品配置信息*/
     async productList(){
       const res = await this.$api.requested({
         "id": 20221021095503,
-        "version":1,
         "content": {
           "sa_quotedpriceid":this.$route.query.id     //sat_notice_classid<=0时 为新增
         }
       })
       this.totalPrice = 0
       console.log(res.data,"产品配置信息")
+      this.mainData.specialoffer = 0
       res.data.forEach((item)=> {
+        console.log(item,'item')
+        if (item.discountDifferenceAmount < 0){
+          this.mainData.specialoffer = 1
+        }
         this.totalPrice = this.totalPrice + item.amount
       })
       /*this.queryMainData(this.$route.query.id)*/
@@ -252,7 +335,12 @@ export default {
     onSuccess(){
       this.queryMainData(this.$route.query.id)
 
+    },
+    productSuccess(){
+      /*this.queryMainData(this.$route.query.id)*/
+      this.productList()
     }
+
   },
   mounted() {
     this.queryMainData(this.$route.query.id)

+ 7 - 4
src/SDrpManagement/QuotedPrice/detail/modules/detailed/index.vue

@@ -5,8 +5,9 @@
         <div slot="title" class="my-label__title">基本信息</div>
         <el-descriptions-item label="单号">{{ basic.billno?basic.billno:"--" }}</el-descriptions-item>
         <el-descriptions-item label="报价类型">{{ basic.quotedpricetype?basic.quotedpricetype:"--" }}</el-descriptions-item>
-        <!-- <el-descriptions-item label="项目编号">{{ basic.projectnum?basic.projectnum:"--" }}</el-descriptions-item>
-        <el-descriptions-item label="项目名称">{{ basic.projectname?basic.projectname:"--"}}</el-descriptions-item> -->
+        <el-descriptions-item v-if="basic.quotedpricetype === '项目报价'" label="项目名称">{{ basic.projectname?basic.projectname:"--"}}</el-descriptions-item>
+         <el-descriptions-item v-if="basic.quotedpricetype === '项目报价'" label="项目编号">{{ basic.projectnum?basic.projectnum:"--" }}</el-descriptions-item>
+
         <el-descriptions-item label="产品系列">
           <span v-for="(item,index) in basic.itemtype">
             {{basic.itemtype.length === 0?item:index === basic.itemtype.length -1?item:item+','}}
@@ -18,7 +19,9 @@
         <el-descriptions-item label="手机号">{{ basic.contactsphonenumber?basic.contactsphonenumber:"--" }}</el-descriptions-item>
         <el-descriptions-item label="报价日期">{{ basic.contactsphonenumber?basic.contactsphonenumber:"--" }}</el-descriptions-item>
         <el-descriptions-item label="有效期">{{ basic.begdate?basic.begdate + '至' + basic.enddate:"--" }}</el-descriptions-item>
-        <el-descriptions-item label="总金额">{{ basic.remarks?basic.remarks:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="折扣(%)">{{ basic.discountrate?Math.round((basic.discountrate * 100)*100)/100:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="总金额(元)">{{ totalPrice?totalPrice:"--" }}</el-descriptions-item>
+
         <el-descriptions-item label="品牌">{{ basic.brandname?basic.brandname:"--" }}</el-descriptions-item>
         <el-descriptions-item label="领域">{{ basic.tradefield?basic.tradefield:"--" }}</el-descriptions-item>
 
@@ -55,7 +58,7 @@
 <script>
 export default {
   name: "index",
-  props:["data"],
+  props:["data","totalPrice"],
   data(){
     return {
       basic:[],

+ 2 - 0
src/SDrpManagement/QuotedPrice/detail/modules/productInventory/index.vue

@@ -358,6 +358,7 @@ export default {
       if (this.total !== 0){
         this.totalPrice = Math.round(res.data[0].rowstotal[0].sumamount * 100)/100
       }
+      this.$emit('productSuccess')
 
     },
     handleSizeChange(val) {
@@ -478,6 +479,7 @@ export default {
         this.saveShow = false
         this.index = ''
         this.productData()
+        this.$emit('productSuccess')
 
       })
     }

+ 1 - 1
src/SDrpManagement/QuotedPrice/modules/ProjectQuotationAdd.vue

@@ -544,7 +544,7 @@ export default {
     },
     async customerList(){
       if (this.form.sa_projectid === '0' && this.form.type === '客户报价'){
-        this.customerParam.content.where.type = 2
+        this.customerParam.content.where.type = 7
       }else {
         this.customerParam.content.where.type = 4
         this.customerParam.content.where.sa_projectid = this.form.sa_projectid

+ 2 - 2
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