bug修改

src/HDrpManagement/contractManage/components/productList/productBillno.vue

@@ -16,7 +16,7 @@
         ></uploadAllData>
         <el-button class="inline-16" v-if="tool.checkAuth($route.name,'productBillManage') && data.status === '新建' && isLeader" size="small" :type="delProductData.length === 0?'':'primary'" @click="onDelProduct" :disabled="delProductData.length === 0">删 除</el-button>
         <addProductContract class="inline-16"  title="添 加" :tablecolsAdd="tablecolsAdd" :tradefield="data.tradefield" :data="data"
-                            @addSuccess="queryProuctAdds" ref="addProduct" @addProduct="queryProuctAdd" @uploadData="queryUploadData" v-if="tool.checkAuth($route.name,'productBillManage') && data.status === '新建' && isLeader"
+                            @addSuccess="queryProuctAdds" @addAll="addAll" ref="addProduct" @addProduct="queryProuctAdd" @uploadData="queryUploadData" v-if="tool.checkAuth($route.name,'productBillManage') && data.status === '新建' && isLeader"
         >
         </addProductContract>
       </div>
@@ -334,6 +334,7 @@ export default {
       })
       this.tool.showMessage(res,() => {
         this.$emit('onSuccess')
+        this.listData()
         this.$refs.addProduct.listData()
       })
     },
@@ -387,6 +388,7 @@ export default {
       })
       this.tool.showMessage(res,() => {
         this.$refs.addProduct.listData()
+        this.listData()
         this.$emit('onSuccess')
       })
     },
@@ -425,6 +427,11 @@ export default {
         this.$emit("delSuccess")
       })
     },
+    addAll(){
+      this.listData()
+      this.$emit('onSuccess')
+    }
+
   },
 };
 </script>

src/HDrpManagement/contractManage/modules/detail.vue

@@ -29,12 +29,12 @@
         <submit-check class="inline-16"  :disabled="!isLeader" ref="submit" :data="mainData" @onSuccess="queryMainData($route.query.id)" />
         <reverseCheck class="inline-16" @onSuccess="queryMainData($route.query.id)" :data="mainData" v-if="tool.checkAuth($route.name,'reverseCheck') && mainData.status === '审核'"  />
 <!--        <revoke class="inline-16" @onSuccess="queryMainData()" :data="mainData" v-if="tool.checkAuth($route.name,'revoke') && mainData.status === '已提交' && isLeader" ></revoke>-->
-        <contractOver class="inline-16" v-if="tool.checkAuth($route.name,'contractOver') && mainData.status != '已终止' && mainData.status != '审核' && isLeader" :disabled="!isLeader" :id="mainData.sa_contractid" @onSuccess="queryMainData($route.query.id)" />
+        <contractOver class="inline-16" v-if="tool.checkAuth($route.name,'contractOver') && mainData.status == '审核' && isLeader" :disabled="!isLeader" :id="mainData.sa_contractid" @onSuccess="queryMainData($route.query.id)" />
         <Del class="inline-16" :idName="20221121202502" :id="mainData.sa_contractid" idKey="sa_contractids"  v-if="tool.checkAuth($route.name,'toVoid') && (mainData.status == '新建' || mainData.status == '已终止') && isLeader"/>
       </div>
       <div slot="slot0" >
         <!--项目产品明细折扣表-->
-        <productBillno :data="mainData" :isLeader="isLeader" ref="billno" @priceChange="queryMainData($route.query.id)" v-if="mainData.type == '项目'">
+        <productBillno :data="mainData" :isLeader="isLeader" ref="billno" @priceChange="queryMainData($route.query.id)" @delSuccess="queryMainData" @onSuccess="productAdd" v-if="mainData.type == '项目'">
           <template v-slot:edit="scope">
 <!--            <el-button
               v-if="tool.checkAuth($route.name,'productBillManage')"
@@ -243,6 +243,7 @@ export default {
       const res = await this.$api.requested({
         "id":20221121195102,
         "content": {
+          "nocache":true,
           "sa_contractid": this.$route.query.id
         }
       })
@@ -1330,6 +1331,9 @@ export default {
     },
     closeDrawer(){
       this.$refs.classList.listData()
+    },
+    productAdd(){
+      this.queryMainData()
     }
     // async getModelList () {
     //   let res = await this.$api.requested({

src/HManagement/clueManage/clue_private/modules/add.vue

@@ -335,7 +335,7 @@ export default {
     /*获取单位*/
     queryUnitname(){
       this.$store.dispatch('optiontypeselect','scaleunitname').then(res=>{
-        this.param.unitname = res.data[0].value
+        this.param.content.unitname = res.data[0].value
         this.unitnameList = res.data
       })
     },

src/SManagement/orderclue/components/edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="edit">
-    <el-button size="mini" :type="disabled || data.status === '已无效' ? 'defalt':'primary'" :disabled="disabled || data.status === '已无效'" @click="editBtn">编 辑</el-button>
+    <el-button size="mini" :type="disabled || data.status === '已无效'|| data.status === '已过期' ? 'defalt':'primary'" :disabled="disabled || data.status === '已无效' || data.status === '已过期'" @click="editBtn">编 辑</el-button>
     <el-drawer title="编辑线索" :visible.sync="drawer" size="800px" direction="rtl" append-to-body :show-close="false" @close="onClose">
       <div class="drawer__panel">
         <el-row :gutter="10">

src/SManagement/orderclue/components/follow.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="follow" style="margin-right:10px">
-    <el-button size="mini" :type="disabled || data.status === '已无效'?'':'primary'" @click="followBtn" :disabled="disabled || data.status === '已无效'">跟进</el-button>
+    <el-button size="mini" :type="disabled || data.status === '已无效' || data.status === '已过期'?'':'primary'" @click="followBtn" :disabled="disabled || data.status === '已无效' || data.status === '已过期'">跟进</el-button>
     <el-drawer title="线索跟进" append-to-body :visible.sync="dialogVisible" size="30%" :before-close="handleClose" :show-close="false">
       <div class="drawer__panel">
         <el-form :model="param" :rules="rules" ref="ruleForm" label-width="110px" class="demo-ruleForm"
@@ -31,7 +31,7 @@
             type="button">
           </upload>
         </el-form>
-        
+
       </div>
       <div class="fixed__btn__panel">
         <el-button size="small" @click="dialogVisible = false" class="normal-btn-width">取 消</el-button>

src/SManagement/orderclue_detail/components/changeCustomer.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="mini" :type="disabled || data.status === '已无效'?'':'primary'" @click="onShow" :disabled="disabled || data.status === '已无效'" >转化客户</el-button>
+    <el-button size="mini" :type="disabled || data.status === '已无效' || data.status === '已过期'?'':'primary'" @click="onShow" :disabled="disabled || data.status === '已无效' || data.status === '已过期'" >转化客户</el-button>
     <el-drawer
         title="转化为客户"
         :visible.sync="drawer"

src/SManagement/orderclue_detail/components/changeProject.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="mini" :type="disabled || data.status === '已无效'?'':'primary'" @click="onShow" :disabled="disabled || data.status === '已无效'" >转化项目</el-button>
+    <el-button size="mini" :type="disabled || data.status === '已无效' || data.status === '已过期'?'':'primary'" @click="onShow" :disabled="disabled || data.status === '已无效' || data.status === '已过期'" >转化项目</el-button>
     <el-drawer
         title="新建项目商机"
         :visible.sync="dialogFormVisible"

src/SManagement/orderclue_detail/components/delete.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="mini" :type="disabled || data.status === '已无效'?'':'primary'" @click="dialog=true" :disabled="disabled || data.status === '已无效'">作 废</el-button>
+    <el-button size="mini" :type="disabled ?'':'primary'" @click="dialog=true" :disabled="disabled ">作 废</el-button>
     <el-dialog append-to-body width="30%" title="作废" :visible.sync="dialog">
       <el-input type="textarea" v-model="deletereason" size="small" :autosize="{minRows:6}" placeholder="作废原因"></el-input>
       <div class="dialog-footer">

src/SManagement/orderclue_detail/components/noNull.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="inline-16">
-    <el-button size="mini" :type="disabled || data.status === '已无效'?'':'primary'" :disabled="disabled || data.status === '已无效'" @click="dialog=true">无 效</el-button>
+    <el-button size="mini" :type="disabled || data.status === '已无效' || data.status === '已过期'?'':'primary'" :disabled="disabled || data.status === '已无效' || data.status === '已过期'" @click="dialog=true">无 效</el-button>
     <el-dialog append-to-body width="30%" title="无效" :visible.sync="dialog">
       <el-input type="textarea" v-model="deletereason" size="small" placeholder="无效原因"></el-input>
       <div class="dialog-footer">
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-/* 
+/*
 id:数据id
 nameId:接口id
 nameKey:接口字段

src/SManagement/orderclue_detail/index.vue

@@ -28,7 +28,7 @@
         <changeProject v-if="mainData.isproject == 0 && tool.checkAuth($route.name,'changeProject')" :data="mainData" :disabled="!isHandle" class="inline-16" @onChangeProject="queryMainData($route.query.id)"/>
         <el-button :type="!isHandle || mainData.status === '已无效'?'':'primary'" v-if="tool.checkAuth($route.name,'goBack') && mainData.status != '已转化' && mainData.isprivate !== 1" :disabled="!isHandle || mainData.status === '已无效'" class="inline-16" size="mini" @click="goBack">退 回</el-button>
         <noNull v-if="tool.checkAuth($route.name,'noNull') && mainData.status != '已转化' " class="inline-16" :data="mainData" :disabled="!isHandle" @onSuccess="$store.dispatch('changeDetailDrawer',false);$router.replace('/orderclue')" :id="mainData.sat_orderclueid"/>
-        <Del v-if="tool.checkAuth($route.name,'toVoid') && mainData.status != '已转化'" class="inline-16" :data="mainData" :disabled="!isHandle" :idName="20221123193702" @onSuccess="$store.dispatch('changeDetailDrawer',false);$router.replace('/orderclue')" :id="mainData.sat_orderclueid" idKey="sat_orderclueids"/>
+        <Del v-if="tool.checkAuth($route.name,'toVoid') " class="inline-16" :data="mainData" :disabled="!isHandle" :idName="20221123193702" @onSuccess="$store.dispatch('changeDetailDrawer',false);$router.replace('/orderclue')" :id="mainData.sat_orderclueid" idKey="sat_orderclueids"/>
       </div>
       <div slot="slot1" class="container normal-panel">
         <BaseInfo :detailInfo="detailInfo"/>

src/template/addProductContract/index.vue

@@ -377,6 +377,7 @@ export default {
     },
     onSuccess () {
       console.log('成功')
+      this.$emit('addAll')
       this.listData()
     },
     onClose(){

src/views/mediaStatistics/modules/salesfunnel.vue

@@ -24,7 +24,7 @@
       </el-table-column>
       <el-table-column
         prop="signamount_due"
-        label="签约金额(万元)">
+        label="签约金额(元)">
       </el-table-column>
       <el-table-column
         prop="totalinvestment"
@@ -35,7 +35,7 @@
         label="项目预算(万元)">
       </el-table-column>
     </el-table>
-    </div> 
+    </div>
   </div>
 </template>
 
@@ -122,4 +122,4 @@ export default {
 .container{
   height:calc(100vh - 200px)
 }
-</style>
+</style>