修复指标列表编辑

src/option/aftersales/vueTvemp.js

@@ -146,6 +146,28 @@ export const columnList = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'entryTime',
+    label: '财务入账时间',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'operator',
+    label: '操作人',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'deliverGoodsTime',
     label: '送货时间',
@@ -296,28 +318,7 @@ export const columnList = [
     head: false,
   },
   
-  {
-    prop: 'entryTime',
-    label: '财务入账时间',
-    type: 2,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-  },
-  {
-    prop: 'operator',
-    label: '操作人',
-    type: 2,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-  },
+
   {
     prop: 'remarks',
     label: '备注',

src/views/aftersales/aftersalesWorkOrder.vue

@@ -1429,7 +1429,7 @@ const ButtonPermissions = computed(() => {
         batchReject: UserPermissions.value != '仓库客服', //批量打回
         assignment:false, //工单指派
         applyArbitration: false, //客服介入
-        DingTalkNumber: UserPermissions.value == '总部客服经理', //钉钉号填写
+        DingTalkNumber:false, //钉钉号填写
         batchFinish: UserPermissions.value != '仓库客服', //批量完结
         appeal: false, //申诉
         ManagerConfirmed: false, //处理完毕下面的客服经理批量确定
@@ -1444,6 +1444,7 @@ const ButtonPermissions = computed(() => {
         batchReject: UserPermissions.value == '职能客服' || UserPermissions.value == '客服经理', //批量打回
         assignment: false, //工单指派
         applyArbitration: UserPermissions.value == '仓库客服', //客服介入
+        DingTalkNumber:false, //钉钉号填写
         batchFinish: UserPermissions.value != '仓库客服', //批量完结
         Batchdetermination: UserPermissions.value != '仓库客服', //批量确定
         appeal: false, //申诉
@@ -1459,6 +1460,7 @@ const ButtonPermissions = computed(() => {
         batchReject: false, //批量打回
         assignment: false, //工单指派
         applyArbitration: false, //客服介入
+        DingTalkNumber:false, //钉钉号填写
         batchFinish: false, //批量完结
         appeal: UserPermissions.value == '仓库客服' && AppealStatusT.value, //申诉
         Batchdetermination: UserPermissions.value == '仓库客服', //批量确定
@@ -1477,6 +1479,7 @@ const ButtonPermissions = computed(() => {
         batchFinish: UserPermissions.value != '仓库客服', //批量完结
         appeal: false, //申诉
         Batchdetermination: false, //批量确定
+        DingTalkNumber:false, //钉钉号填写
         ManagerConfirmed: false, //处理完毕下面的客服经理批量确定
         ArbitrationDetermination: false, //批量仲裁确定
         Financial_accounting: false, //财务入账
@@ -1491,6 +1494,7 @@ const ButtonPermissions = computed(() => {
         applyArbitration: false, //客服介入
         batchFinish: false, //批量完结
         appeal: false, //申诉
+        DingTalkNumber:false, //钉钉号填写
         Batchdetermination: false, //批量确定
         ManagerConfirmed: false, //处理完毕下面的客服经理批量确定
         ArbitrationDetermination: false, //批量仲裁确定
@@ -1498,7 +1502,7 @@ const ButtonPermissions = computed(() => {
         defaultassignments: false, //默认指派
         export_Report: true, //导出报表
       };
-    case 5: //仲裁中
+    case 5: //客服介入
       return {
         add: false, //新增按钮
         batchReject: false, //批量打回
@@ -1506,6 +1510,7 @@ const ButtonPermissions = computed(() => {
         applyArbitration: false, //客服介入
         batchFinish: false, //批量完结
         appeal: false, //申诉
+        DingTalkNumber: false, //钉钉号填写
         Batchdetermination: false, //批量确定
         ManagerConfirmed: false, //处理完毕下面的客服经理批量确定
         ArbitrationDetermination: true, //批量仲裁确定
@@ -1520,11 +1525,12 @@ const ButtonPermissions = computed(() => {
         assignment: false, //工单指派
         applyArbitration: false, //客服介入
         batchFinish: false, //批量完结
+        DingTalkNumber:UserPermissions.value == '总部客服经理' && !AppealStatusT.value, //钉钉号填写, //钉钉号填写
         appeal: UserPermissions.value == '仓库客服', //申诉
         Batchdetermination: false, //批量确定
         ManagerConfirmed: false, //处理完毕下面的客服经理批量确定
         ArbitrationDetermination: false, //批量仲裁确定
-        Financial_accounting: true, //财务入账
+        Financial_accounting: true && !AppealStatusT.value, //财务入账
         defaultassignments: false, //默认指派
         export_Report: true, //导出报表
       };
@@ -3912,13 +3918,15 @@ const amountMoney = () => {
 };
 // 财务入账按钮
 const Financialfillingbtn = () => {
+
   if (!details.selectionList.length) {
     ElMessage({
-      message: '请勾选选择要删除的数据',
+      message: '请勾选数据',
       type: 'warning',
     });
     return;
   }
+  FinancialFrom.value={}
   dialogFinancialaccounting.value = true; //开启财务入账弹窗
 };
 // 财务入账确定按钮

src/views/supervise/IndicatorList.vue

@@ -216,7 +216,7 @@
 
     <el-dialog v-model="IndicatorEditing" title="编辑" width="30%">
       <el-form v-loading="Indicatoreditingload" :model="lassificationformedit" label-width="70px">
-        <el-form-item label="考核部门">
+        <el-form-item label="考核部门" v-if="Assessmentstatus">
           <el-tree-select
             v-model="lassificationformedit.assessDept"
             :data="AssessmentDepartment"
@@ -226,7 +226,13 @@
             @node-click="handleNodeClick"
           />
         </el-form-item>
-
+        <el-form-item label="考核部门" v-else>
+          <el-input
+            v-model="lassificationformedit.assessDept"
+            disabled
+            placeholder="暂无考核部门"
+          />
+        </el-form-item>
         <el-form-item label="指标分类">
           <el-select
             v-model="lassificationformedit.indexClassification"
@@ -238,8 +244,8 @@
             <el-option
               v-for="item in classificationoptions"
               :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
+              :label="item.name"
+              :value="item.id"
             />
           </el-select>
         </el-form-item>
@@ -277,7 +283,11 @@
         </el-form-item>
 
         <el-form-item label="考核人">
-          <el-input v-model="lassificationformedit.assessUserName" placeholder="请输入考核人" />
+          <el-input
+            v-model="lassificationformedit.assessUserName"
+            disabled
+            placeholder="请输入考核人"
+          />
         </el-form-item>
 
         <el-form-item label="分数备注">
@@ -346,61 +356,61 @@ const lassificationform = ref({}); //分类表单
 const lassificationformedit = ref({}); //编辑分类表单
 const title = ref(true); //标题
 const EditID = ref(true); //编辑需要的ID
-const currentPage=ref(1)
+const currentPage = ref(1);
 const newlyAdded = ref(false); //新增弹窗
 const loadingAddPopup = ref(false); //弹窗加载
 const selectionList = ref([]); //选中数据
 const classificationoptions = ref([]); //指标分类
 const searchFrom = ref({}); //搜索表单
-const Indicatoritems=ref([]);//指标项目
+const Indicatoritems = ref([]); //指标项目
 const drawerShow = ref(false); //抽屉显示隐藏
 const search = ref(true); //头部搜索
-const department=ref();//考核部门存储
+const department = ref(); //考核部门存储
 const Indicatorediting = ref({}); //编辑表单
-const query=ref({});//搜索
+const query = ref({}); //搜索
 const columnList = ref();
 const indicatorsValue = ref(0); //分类初始值
 const indicatorsValues = ref(1); //子类
-const IndicatorScore=ref([]);//指标分数
+const IndicatorScore = ref([]); //指标分数
+const Assessmentstatus = ref(true); //编辑考核部门状态
 const Indicatoreditingload = ref(false); //编辑加载
 const AssessmentDepartment = ref([]); //考核部门
+const tempRow = ref(); //编辑信息
 const url = '';
 const srcList = [];
 const onLoad = () => {
   let data = {
     current: current.value,
     size: pageSize.value,
-    ...query.value//搜索参数
+    ...query.value, //搜索参数
   };
   loadingclassification.value = true; //开启加载效果
   $_findIndicatorsList(data)
     .then(res => {
       console.log(res);
       if (res.data.data.records) {
-              //   指标状态1 表示提交 2 表示审核 通过 3 表示审核失败
-
-
-      res.data.data.records.forEach(item=>{
-        if(item.indicatorsStatus ==1){
-          item.indicatorsStatus = '提交';
-        } else if(item.indicatorsStatus ==2){
-          item.indicatorsStatus = '审核通过';
-        } else if(item.indicatorsStatus ==3){
-          item.indicatorsStatus = '审核失败';
-        } 
+        //   指标状态1 表示提交 2 表示审核 通过 3 表示审核失败
+
+        res.data.data.records.forEach(item => {
+          if (item.indicatorsStatus == 1) {
+            item.indicatorsStatus = '提交';
+          } else if (item.indicatorsStatus == 2) {
+            item.indicatorsStatus = '审核通过';
+          } else if (item.indicatorsStatus == 3) {
+            item.indicatorsStatus = '审核失败';
+          }
 
-      //    是否存在异议 0 表示没有1表示存在
-        if(item.isObjection !=null){
-            if(item.isObjection){
+          //    是否存在异议 0 表示没有1表示存在
+          if (item.isObjection != null) {
+            if (item.isObjection) {
               item.isObjection = '没有';
-            }else{
+            } else {
               item.isObjection = '存在';
             }
-        }
-      })
+          }
+        });
 
         classificationdata.value = res.data.data.records; //数据
-
       }
       total.value = res.data.data.total; //总页数
     })
@@ -423,7 +433,6 @@ const currentChange = val => {
 
 // 获取分类指标
 // 在外部定义递归函数，用于加载和更新分类
-// 请注意，因为没有$_parentId函数的实现细节，
 const loadChildren = (targetList, parentId, indicatorValue) => {
   let dataSub = { parentId };
   return $_parentId(dataSub).then(Rs => {
@@ -432,10 +441,10 @@ const loadChildren = (targetList, parentId, indicatorValue) => {
       label: item.title,
       id: item.id,
       key: item.key,
-      hasChildren: item.hasChildren,  // 假定hasChildren是一个布尔值
-      children: []  
+      hasChildren: item.hasChildren, // 假定hasChildren是一个布尔值
+      children: [],
     }));
-    
+
     function findAndReplace(target, value) {
       for (let i = 0; i < target.length; i++) {
         if (target[i].value === value) {
@@ -447,12 +456,12 @@ const loadChildren = (targetList, parentId, indicatorValue) => {
         }
       }
     }
-    
+
     findAndReplace(targetList, indicatorValue); // 查找并替换targetList的正确位置
 
     const childRequests = children
       .filter(child => child.hasChildren)
-      .map(child => loadChildren(targetList, child.id, child.value));  // 使用完整的targetList进行递归
+      .map(child => loadChildren(targetList, child.id, child.value)); // 使用完整的targetList进行递归
 
     // 等待所有子分类都加载完毕
     return Promise.all(childRequests);
@@ -460,8 +469,8 @@ const loadChildren = (targetList, parentId, indicatorValue) => {
 };
 
 // 初始时获取顶级分类
-const loadInitialCategories = () => {
-  let dataSub = { parentId: 0 };
+const loadInitialCategories = (val = 0) => {
+  let dataSub = { parentId: val };
   $_parentId(dataSub).then(res => {
     console.log(res, '初始化顶级分类-------');
     res.data.data.forEach(item => {
@@ -471,13 +480,12 @@ const loadInitialCategories = () => {
         id: item.id,
         key: item.key,
         hasChildren: item.hasChildren,
-        children: []  // 初始化子分类列表
+        children: [], // 初始化子分类列表
       });
     });
   });
 };
 
-// 如果是页面中的脚本，你可以直接这样调用
 loadInitialCategories();
 
 // 当分类项被点击时调用
@@ -498,14 +506,7 @@ const classification = (val, index) => {
     console.log('分类不存在于当前的分类列表中');
   }
 };
-// 分类编辑
-const ClassificationDditing = val => {
-  console.log(val, '编辑');
-  EditID.value = val.row.id; //编辑需要的ID
-  let data = val.row;
-  IndicatorEditing.value = true; //编辑弹窗展开
-  classification();
-};
+
 // 获取指标分类
 const Obtainclassification = () => {
   $_selectParentCalssifyList().then(res => {
@@ -518,7 +519,7 @@ const handleNodeClick = (data, node, component) => {
   // 'node' 是 Node 对象
   // 'component' 是组件的引用
   // console.log('You clicked:', data);
-  department.value = data;//存储当前点击的考核部门
+  department.value = data; //存储当前点击的考核部门
   console.log(department.value, '当前点击的考核部门');
   if (data.hasChildren) {
     classification(data.id, data.value);
@@ -533,22 +534,24 @@ const searcheNodeClick = (data, node, component) => {
   // 'node' 是 Node 对象
   // 'component' 是组件的引用
   // console.log('You clicked:', data);
-  department.value = data;//存储当前点击的考核部门
+  department.value = data; //存储当前点击的考核部门
   console.log(department.value, '当前点击的考核部门');
   if (data.hasChildren) {
     classification(data.id, data.value);
   }
   // query.value.assessDeptName = data.label
-  query.value.assessDept = data.id
-  onLoad()
+  query.value.assessDept = data.id;
+  onLoad();
   // 根据你的需求处理点击事件
 };
 
-const Indicatortype=()=>{
-  query.value.parentClassifyId =  classificationoptions.value.find(res=>res.id ==searchFrom.value.classifyId).id
+const Indicatortype = () => {
+  query.value.parentClassifyId = classificationoptions.value.find(
+    res => res.id == searchFrom.value.classifyId
+  ).id;
   // searchFrom.classifyId
-  onLoad()
-}
+  onLoad();
+};
 Obtainclassification();
 // 分类新增按钮
 const AddCategory = () => {};
@@ -586,7 +589,6 @@ const BatchDelete = () => {
     });
 };
 
-
 // 分类删除
 const CategoryDeletion = val => {
   ElMessageBox.confirm(`是否删除${val.row.classifyName}分类?`, 'Warning', {
@@ -678,31 +680,36 @@ const searchHide = () => {
   search.value = !search.value;
 };
 // 指标分类选择
-const ClassificationChange=(val)=>{
+const ClassificationChange = val => {
   console.log(val);
-  classificationindicators(val)
-}
+  classificationindicators(val);
+};
 // 分类指标
-const classificationindicators = (val) => {
-  $_selectChildCalssifyList({pid:val}).then(res => {
+const classificationindicators = val => {
+  $_selectChildCalssifyList({ pid: val }).then(res => {
     console.log(res, '分类列表');
-    if(res.data.data){
+    if (res.data.data) {
       Indicatoritems.value = res.data.data;
     }
   });
 };
-const IndicatoritemsChange=(val)=>{ 
-  selectPointListChange(val)
-}
+const IndicatoritemsChange = val => {
+  selectPointListChange(val);
+};
 // 指标分数获取
-const selectPointListChange=(val)=>{
-  $_selectPointList({id:val}).then(res=>{
-    console.log(res,'分数列表');
-     if(res.data.data){
-      IndicatorScore.value=  res.data.data
-     }
-  })
-}
+const selectPointListChange = val => {
+  $_selectPointList({ id: val }).then(res => {
+    console.log(res, '分数列表');
+    if (res.data.data) {
+      IndicatorScore.value = res.data.data;
+      if (!Assessmentstatus.value) {
+        lassificationformedit.value.IndicatorScore = IndicatorScore.value.find(
+          res => res.point == tempRow.value.point
+        ).id;
+      }
+    }
+  });
+};
 //  查看信息
 const ClassificationIndicatorView = val => {
   console.log(val, '查看信息');
@@ -740,56 +747,119 @@ const ClassificationIndicatorView = val => {
       loadingAddPopup.value = false; //关闭弹窗加载效果
     });
 };
+// 分类编辑
+// @ApiModelProperty(value = "考核部门")
+// private Long assessDept;
+
+// @ApiModelProperty(value = "考核部门名称")
+// private String assessDeptName;
+
+// @ApiModelProperty(value = "考核人")
+// private Long assessUserId;
+
+// @ApiModelProperty(value = "考核人名称")
+// private String assessUserName;
+
+// @ApiModelProperty(value = "考核指标")
+// private Long classifyId;
+
+// @ApiModelProperty(value = "分数")
+// private int point;
+
+// @ApiModelProperty(value = "考核备注")
+// private String remark;
+
+// @ApiModelProperty(value = "指标状态 1 表示提交 2 表示审核 通过 3 表示审核失败")
+// private Integer indicatorsStatus;
+
+// @ApiModelProperty(value = "是否存在异议 0 表示没有 1 表示存在")
+// private Integer isObjection;
+
+// @ApiModelProperty(value = "异议备注")
+// private String objectionRemark;
+
+// 编辑弹窗展开
+const ClassificationDditing = async val => {
+  tempRow.value = val.row; //保存当前行数据到临时变量中，以便在编辑弹窗中使用。
+  Assessmentstatus.value = false; //禁止修改考核部门
+  console.log(val, '编辑');
+  IndicatorScore.value = []; //指标分数重置
+  Indicatoritems.value = []; //指标项目重置
+
+  lassificationformedit.value.IndicatorScore = ''; //重置指标分数
+  // lassificationformedit.value.Indicatoritems=''
+
+  ClassificationChange(val.row.parentClassifyId); //获取指标项目，传入指标分类ID
+  IndicatoritemsChange(val.row.classifyId); //通过指标项目DI获取指标分数
+  lassificationformedit.value.indexClassification = val.row.parentClassifyId; //指标项目ID
+
+  lassificationformedit.value.Indicatoritems = val.row.classifyId; //指标项目ID
+  (lassificationformedit.value.assessDept = val.row.assessDeptName), //考核部门名称
+    // 固定值
+    (lassificationformedit.value.objectionRemark = val.row.objectionRemark), //异议描述
+    (lassificationformedit.value.textarea = val.row.remark), //分数备注
+    (lassificationformedit.value.assessUserName = val.row.assessUserName), //考核人名称
+    // 固定值
+    // lassificationformedit.value.IndicatorScore =  IndicatorScore.value.find(res=>res.point == val.row.point).id, //指标分数
+    (EditID.value = val.row.id); //编辑需要的ID
+  let data = val.row;
+  IndicatorEditing.value = true; //编辑弹窗展开
+  classification();
+};
+
 // 编辑信息
 const IndicatorEditingFn = () => {
-  console.log(lassificationformedit.value.assessDept,'考核部门');
-
   let data = {
-    id: EditID.value,//编辑id
-    assessDept: department.value.id, //考核部门ID
-    assessDeptName: department.value.label , //考核部门名称
-    assessUserId: '', //考核人ID
-    assessUserName: lassificationformedit.value.assessUserName, //考核人名称
-
-    point:IndicatorScore.value.find(res=>res.id ==lassificationformedit.value.IndicatorScore).point, //指标分数
+    id: EditID.value, //编辑id
+    // assessDept: department.value.id, //考核部门ID
+    // assessDeptName: department.value.label , //考核部门名称
+    // assessUserId: '', //考核人ID
+    // assessUserName: lassificationformedit.value.assessUserName, //考核人名称
+    point: IndicatorScore.value.find(res => res.id == lassificationformedit.value.IndicatorScore)
+      .point, //指标分数
     remark: lassificationformedit.value.textarea, //分数备注
     objectionRemark: lassificationformedit.value.objectionRemark, //异议描述
+    // 指标项目名称
+    classifyId: lassificationformedit.value.Indicatoritems, // 指标项目ID
+    classifyName: Indicatoritems.value.find(
+      res => res.id == lassificationformedit.value.Indicatoritems
+    ).name, //指标项目名称
   };
-  console.log(data,'处理好的参数');
-
-  $_updateIndicators(data).then(res => {
-    console.log(res, '编辑成功');
-    if(res.data.code == 200){
-      IndicatorEditing.value = false; //编辑弹窗关闭
-      onLoad()
-    }
-  }).catch(res=>{
-
-  }).finally(()=>{
+  console.log(data, '处理好的参数');
 
-  });
+  $_updateIndicators(data)
+    .then(res => {
+      console.log(res, '编辑成功');
+      if (res.data.code == 200) {
+        IndicatorEditing.value = false; //编辑弹窗关闭
+        onLoad();
+      }
+    })
+    .catch(res => {})
+    .finally(() => {
+      Assessmentstatus.value = true; //可以修改考核部门
+    });
 };
 const searchChangeS = () => {
   searchFrom.value = {}; //重置搜索参数
-  query.value={}
+  query.value = {};
   onLoad();
 };
 // 查询搜索
 const searchChange = () => {
-  searchFrom.createTime
-  if(searchFrom.value.createTime){
-    query.value.startDateStr=searchFrom.value.createTime[0],
-    query.value.endDateStr=searchFrom.value.createTime[1]
- 
+  searchFrom.createTime;
+  if (searchFrom.value.createTime) {
+    (query.value.startDateStr = searchFrom.value.createTime[0]),
+      (query.value.endDateStr = searchFrom.value.createTime[1]);
   }
-  // ...searchFrom.value, 
+  // ...searchFrom.value,
+  onLoad();
+};
+const timeChange = () => {
+  delete query.value.startDateStr;
+  delete query.value.endDateStr;
   onLoad();
 };
-const timeChange=()=>{
-  delete  query.value.startDateStr
-  delete query.value.endDateStr
-  onLoad(); 
-}
 </script>
 
 <style scoped lang="scss">