Karsa 5 月之前
父節點
當前提交
e22c7c2b1b

+ 32 - 34
src/views/custom_manage/custom/customList.vue

@@ -1809,7 +1809,7 @@ initData()
 		:close-on-click-modal="false"
 		:modal-append-to-body="true"
 		:append-to-body="true"
-		@close="closeDia"
+		@close="closeRemark"
 		width="800px"
 		draggable
 		center>
@@ -1819,39 +1819,37 @@ initData()
           <span style="fontSize:16px;">{{lookRemarkTitle}}</span>
         </div>
       </template>
-			<template>
-				<div v-if="(RoleIdentity == 'rai_seller' || RoleIdentity == 'ficc_seller') || (SellerAdminId == lookRemarkItem.SellerId)">
-					<el-input
-						type="textarea"
-						:rows="3"
-						placeholder="请输入文字"
-						v-model="lookRemarkTextarea">
-					</el-input>
-					<div class="look-remark-commit" @click="lookRemarkAdd">保存</div>
-				</div>
-				<el-table
-          :data="lookRemarkList"
-          border
-          max-height="300"
-          style="width: 100%; margin-top: 20px;margin-bottom: 20px"
-        >
-          <el-table-column label="备注内容"  key="Remark"  align="center">
-            <template #default="scope">{{scope.row.Remark}}</template>
-          </el-table-column>
-          <el-table-column label="客户类型" align="center" key="ProductName" v-if="lookRemarkItem.IsShared && (RoleIdentity != 'rai_seller' && RoleIdentity != 'ficc_seller')">
-            <template #default="scope">{{scope.row.ProductName}}</template>
-          </el-table-column>
-          <el-table-column label="创建时间"  key="CreateTime" align="center">
-            <template #default="scope">{{scope.row.CreateTime}}</template>
-          </el-table-column>
-          <el-table-column label="操作" align="center">
-            <template #default="{row}">
-              <el-button type="text" size="default" style="color:red;" v-if="row.ButtonDel"
-                @click="lookRemarkDelete(row)">删除</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-			</template>
+			<div v-if="(RoleIdentity == 'rai_seller' || RoleIdentity == 'ficc_seller') || (SellerAdminId == lookRemarkItem.SellerId)">
+				<el-input
+					type="textarea"
+					:rows="3"
+					placeholder="请输入文字"
+					v-model="lookRemarkTextarea">
+				</el-input>
+				<div class="look-remark-commit" @click="lookRemarkAdd">保存</div>
+			</div>
+			<el-table
+				:data="lookRemarkList"
+				border
+				max-height="300"
+				style="width: 100%; margin-top: 20px;margin-bottom: 20px"
+			>
+				<el-table-column label="备注内容"  key="Remark"  align="center">
+					<template #default="scope">{{scope.row.Remark}}</template>
+				</el-table-column>
+				<el-table-column label="客户类型" align="center" key="ProductName" v-if="lookRemarkItem.IsShared && (RoleIdentity != 'rai_seller' && RoleIdentity != 'ficc_seller')">
+					<template #default="scope">{{scope.row.ProductName}}</template>
+				</el-table-column>
+				<el-table-column label="创建时间"  key="CreateTime" align="center">
+					<template #default="scope">{{scope.row.CreateTime}}</template>
+				</el-table-column>
+				<el-table-column label="操作" align="center">
+					<template #default="{row}">
+						<el-button type="text" size="default" style="color:red;" v-if="row.ButtonDel"
+							@click="lookRemarkDelete(row)">删除</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
 			<div style="padding:20px 0;"></div>
 		</el-dialog>
 

+ 1 - 1
src/views/custom_manage/custom/hooks/customlistHook.js

@@ -721,7 +721,7 @@ export function useViewRemarkCustomDia() {
 		lookRemarkList:[],//查看备注列表
 		*/
 		lookRemarkTitle.value = "备注";
-		lookAuthList.value = [];
+		// lookAuthList.value = [];
 		lookRemarkItem.value = item;
 		customInterence.lookRemarkAuth({
 			CompanyId:item.CompanyId

+ 1 - 1
src/views/custom_manage/customEn/editCustomEn.vue

@@ -48,7 +48,7 @@ function getSellerList(){
 // edit 编辑英文客户 英文客户详情
 const viewType = ref($route.path == '/detailCustomEn'?'detail':'edit')
 const editForm = reactive({
-  CompanyId:$route.query.companyId||0,
+  CompanyId:Number($route.query.companyId)||0,
   CompanyName:"",
   CountryCode:"",
   Country:"",

+ 2 - 2
src/views/custom_manage/overseas/overseasCustomList.vue

@@ -273,7 +273,7 @@ function handleSetCustomStatus({CompanyId},type){
 }
 
 
-const { customInfo,isShareRecodeDialogShow,allowEdit,handleShowShareRecode } = useCommunicaRecordDia();
+const { shareCustomInfo,isShareRecodeDialogShow,allowEdit,handleShowShareRecode } = useCommunicaRecordDia();
 
 </script>
 <template>
@@ -459,7 +459,7 @@ const { customInfo,isShareRecodeDialogShow,allowEdit,handleShowShareRecode } = u
          <!-- 服务记录弹窗 -->
         <ShareListDialog
             :isShareRecodeDialogShow="isShareRecodeDialogShow"
-            :customInfo="customInfo"
+            :customInfo="shareCustomInfo"
             :allowEdit="allowEdit"
             @close="()=>{isShareRecodeDialogShow=false;}"
         />