代码更新

src/HDrpManagement/projectChange/modules/detail.vue

@@ -36,7 +36,7 @@
           </div>
         </div>
         <div>
-          <setStage :stage="stageList" @setStage="setStage"></setStage>
+          <setStage  :stage="stageList" @setStage="setStage"></setStage>
         </div>
       </div>
     </template>
@@ -44,7 +44,7 @@
       <BaseInfo v-if="detailInfo" :detailInfo="detailInfo"/>
     </div>
     <div slot="slot1" class=" normal-panel">
-      <StageTask v-if="mainData" :rowData="mainData"/>
+      <StageTask ref="setStage" v-if="mainData" :rowData="mainData"/>
     </div>
     <div slot="slot2" class=" normal-panel">
       <andEnterprise :rowData="mainData" v-if="flag === 1"/>
@@ -192,6 +192,7 @@ export default {
       })
       this.tool.showMessage(res,()=>{
         this.queryMainData(this.$route.query.id)
+        this.$refs.setStage.listData(this.$route.query.id)
       })
     },
     /*获取货品选择信息*/

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

@@ -60,13 +60,13 @@ export default {
 
   },
   methods: {
-    async listData(){
+    async listData(id){
       const res = await this.$api.requested({
         "id": 20221201140104,
         "content": {
           "pageNumber": 1,
           "pageSize": 90,
-          "sa_projectid":this.rowData.sa_projectid,
+          "sa_projectid":id,
           "isAll":0
         }
       })
@@ -80,7 +80,7 @@ export default {
   },
   mounted() {
     console.log(this.rowData,"工作任务")
-    this.listData()
+    this.listData(this.rowData.sa_projectid)
   }
 };
 </script>

src/HDrpManagement/projectTask/index.vue

@@ -71,7 +71,7 @@
         </div>
         <div v-else-if="scope.data.column.columnname === 'remarks'" >
           <div v-for="(item,index) in scope.data.column.data.projtaskmag_options" :key="index" >
-            <el-tooltip class="item" effect="light" :content="item.remarks" placement="bottom">
+            <el-tooltip class="item" effect="dark" :content="item.remarks" placement="bottom">
               <div v-if="index === 0 && scope.data.column.data.projtaskmag_options.length -1  === index" class="remarks-style">
                 <span class="text-left">{{item.remarks?item.remarks:'--'}}</span>
               </div>

src/HDrpManagement/publicCustomer/modules/detail.vue

@@ -19,7 +19,7 @@
       </div>
       <div slot="customOperation">
         <!-- 此区域提供了自定义操作按钮 -->
-        <div class="inline-16" v-if="tool.checkAuth($route.name,'receive') && mainData.freeget === 1 && length === 0 ">
+        <div class="inline-16" v-if="tool.checkAuth($route.name,'receive')  && length === 0 ">
           <receive  :id="mainData.sa_customersid" @receiveSuccess="receiveSuccess"></receive>
         </div>
         <div class="inline-16" v-if="tool.checkAuth($route.name,'distribution') && length === 0">

src/HDrpManagement/publicManage/index.vue

@@ -17,7 +17,7 @@ vue
       </template>
       <template v-slot:tbOpreation="scope">
 <!--        <delete-btn class="inline-16" @deleteSuccess="$refs.basicLayout.listData()" :id="scope.data.data.sa_customerpoolid" nameId="20221009100602" nameKey="sa_customerpoolids" />-->
-        <delBtn class="inline-16" :data="scope.data.data" @delSuccess="$refs.basicLayout.listData()" ></delBtn>
+        <delBtn class="inline-16" :data="scope.data.data" @delSuccess="$refs.basicLayout.listData()"  ></delBtn>
         <editTemp class="inline-16" :data="scope.data.data" @onSuccess="$refs.basicLayout.listData()"></editTemp>
       </template>
     </basicLayout>

src/HDrpManagement/publicManage/modules/delBtn.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button type="text" size="mini" @click="dialogVisible = true" :disabled="data.isdefault === 1">删 除</el-button>
+    <el-button type="text" size="mini" @click="dialogVisible = true" :disabled="data.isdefault === 1 || data.num_customer === 0">删 除</el-button>
     <el-dialog
         title="删除公海池"
         :visible.sync="dialogVisible"

src/SDrpManagement/salerPrivatecustomer/detail/modules/detailedData.vue

@@ -14,7 +14,7 @@
         <el-descriptions-item label-class-name="my-label" label="合作状态">{{ basic.status?basic.status:"--" }}</el-descriptions-item>
         <el-descriptions-item label-class-name="my-label" label="负责人">{{ basic.createby?basic.createby:"--" }}</el-descriptions-item>
         <el-descriptions-item label-class-name="my-label" label="来源">{{ basic.source?basic.source:"--" }}</el-descriptions-item>
-        <el-descriptions-item label-class-name="my-label" label="所属公海">{{ basic.poolname?basic.poolname:"--" }}</el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" label="所属公海">{{ basic.sourcepoolname?basic.sourcepoolname:"--" }}</el-descriptions-item>
       </el-descriptions>
     </div>