Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/option/supervise/supervise.js

@@ -267,7 +267,18 @@ export const IndicatorColumnList = [
   },
   {
     prop: 'objectionRemark',
-    label: '描述',
+    label: '整改结果',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'appealReason',
+    label: '意见反馈',
     type: 1,
     values: '',
     width: '130',

src/views/aftersales/aftersalesWorkOrder.vue

@@ -2420,6 +2420,7 @@ const Appealbutton = state => {
     let data = {
       peopleEntityList: [], //参数一
       imagePath: '', //申诉图片附件
+      workOrderId:selectList.value[0],//工单ID
     };
     if (AppealeditorState.value) {
       data.workOrderId = details.selectionList[0].workOrderId;

src/views/supervise/management.vue

@@ -34,6 +34,34 @@
             </el-select>
           </el-form-item>
 
+         <el-form-item label="考核范围">
+            <el-tree-select
+              v-model="queryTop.examineDeptName"
+              :data="AssessmentDepartment"
+              check-strictly
+              :render-after-expand="false"
+              style="width: 240px"
+              @node-click="BelongsearcheNodeClick"
+              clearable
+              @change="Belongingdepartment"
+            />
+          </el-form-item>
+
+
+          <el-form-item label="归属部门">
+            <el-tree-select
+              v-model="queryTop.createDeptName"
+              :data="AssessmentDepartment"
+              check-strictly
+              :render-after-expand="false"
+              style="width: 240px"
+              @node-click="BelongsearcheNodeClickFn"
+              clearable
+              @change="BelongingdepartmentFn"
+            />
+          </el-form-item>
+
+
           <el-form-item class="el-btn">
             <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
           </el-form-item>
@@ -276,7 +304,6 @@ const columnList = ref([]);
 const drawerShow = ref(false); //抽屉显示
 const department = ref(); //考核部门存储
 const examineDeptName = ref(''); //考核部门名字
-
 /** 表格实例 */
 const tableNode = ref();
 const departmentNameTemp = ref(''); //归属名称
@@ -495,8 +522,57 @@ const Indicatortype = () => {
   query.value.pid = String(queryTop.value.classificationoptionsvalue);
   onLoad(query.value);
 };
+
+
+
+const BelongsearcheNodeClick = data => {
+  department.value = data; //存储当前点击的考核部门
+  if (data.hasChildren) {
+    classification(data.id, data.value);
+  }
+  query.value.examineDeptName = data.label;
+  onLoad(query.value);
+
+};
+
+
+// 归属部门查询
+const Belongingdepartment = () => {
+  console.log(queryTop.value.examineDeptName,'queryTop.value.createDeptName');
+  if (!queryTop.value.examineDeptName){
+    query.value.examineDeptName = null;
+    onLoad(query.value);
+  }
+};
+
+
+
+const BelongsearcheNodeClickFn = data => {
+  department.value = data; //存储当前点击的考核部门
+  if (data.hasChildren) {
+    classification(data.id, data.value);
+  }
+  query.value.createDeptName = data.label;
+  onLoad(query.value);
+  console.log(data);
+
+};
+
+
+
+const BelongingdepartmentFn = () => {
+  if (!queryTop.value.createDeptName) {
+    query.value.createDeptName = null;
+    onLoad(query.value);
+  }
+};
+
+
+
 // 分类编辑
 const ClassificationDditing = val => {
+
+  lassificationform.value={}
   console.log(val);
   EditID.value = val.row.id; //编辑需要的ID
   title.value = false; //关闭编辑
@@ -508,6 +584,8 @@ const ClassificationDditing = val => {
   lassificationform.value.description = data.description; //分类描述
   lassificationform.value.examineDeptId = data.examineDeptId; //审核部门ID
   departmentName.value = data.createDeptName; //归属部门
+  examineDeptName.value = data.examineDeptName; //考核范围
+  console.log(lassificationform.value,'回显存储');
   // 积分管理回显
   data.pointsEntities.forEach(res => {
     PointsList.value.push({ integral: res.point });
@@ -599,14 +677,14 @@ const newlyAddedFn = formEl => {
   formEl.validate(async valid => {
     if (valid) {
       const _arr = new Set();
-
+      console.log(examineDeptName.value,'考核部门');
       let data = {
         name: lassificationform.value.name, //分类名称
         description: lassificationform.value.description, //分类描述
         pid: lassificationform.value.classificationoptionsvalue, //分类ID
         pointsEntities: [], //积分
         examineDeptId: lassificationform.value.examineDeptId, //考核部门ID
-        examineDeptName: department.value.label ? department.value.label : '', //考核部门名称
+        examineDeptName: department.value.label ? department.value.label : examineDeptName.value, //考核部门名称
       };
       console.log(AssessmentDepartment.value, '部门');
       let content = '';
@@ -644,6 +722,7 @@ const newlyAddedFn = formEl => {
           })
           .catch(res => {})
           .finally(() => {
+            department.value={}
             loadingAddPopup.value = false; //关闭弹窗加载
           });
       } else {
@@ -664,6 +743,7 @@ const newlyAddedFn = formEl => {
           .catch(res => {})
           .finally(() => {
             loadingAddPopup.value = false; //关闭弹窗加载
+            department.value={}
           });
       }
     } else {