lizhuo submits AnnualSaleGoal at 2023-7-21 17:00

src/views/business/spd/goal_management/AnnualSaleGoal.vue

@@ -117,7 +117,7 @@
     <el-table v-loading="loading" :data="annualSaleGoalList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" fixed/>
       <el-table-column label="编码" align="center" prop="code" width="180"/>
-      <el-table-column label="年度销售目标名称" align="center" prop="goalName" width="180"/>
+      <el-table-column label="目标名称" align="center" prop="goalName" width="180"/>
       <el-table-column label="单据日期" align="center" prop="documentDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.documentDate, '{y}-{m}-{d}') }}</span>
@@ -692,6 +692,7 @@ export default {
       const id = row.id || this.ids
       getAnnualSaleGoal(id).then(response => {
         this.form = response.data;
+        this.annualSaleGoalDetailsList = this.form.annualGoalMergeDetails
         this.open = true;
         this.title = "修改年度销售目标";
         if (this.form.documentStatus === '0') {

src/views/business/spd/goal_management/AnnualSaleGoalMerge.vue

@@ -9,61 +9,33 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="销售组织" prop="saleOrg">
-        <el-input
-          v-model="queryParams.saleOrg"
-          placeholder="请输入销售组织"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="销售区域" prop="saleZone">
-        <el-input
-          v-model="queryParams.saleZone"
-          placeholder="请输入销售区域"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-popover-select-v2 v-model="queryParams.saleZoneCode" title="销售区域" valueKey="name"
+                              referName="DEPT_PARAM"
+                              :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
+                              :source.sync="queryParams" placeholder="请输入销售区域">
+        </el-popover-select-v2>
       </el-form-item>
-      <el-form-item label="客户" prop="custom">
-        <el-input
-          v-model="queryParams.custom"
-          placeholder="请输入客户"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="负责人" prop="creator">
-        <el-input
-          v-model="queryParams.creator"
-          placeholder="请输入负责人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="制单人" prop="creator">
+        <el-popover-select-v2 v-model="queryParams.creator" title="制单人" valueKey="name"
+                              referName="CUSTOMER_PARAM"
+                              :dataMapping="{ creatorCode: 'code', creator: 'name'}"
+                              :source.sync="queryParams" placeholder="请输入负责人">
+        </el-popover-select-v2>
       </el-form-item>
       <el-form-item label="一级分类" prop="oneLevelClassify">
-        <el-input
-          v-model="queryParams.oneLevelClassify"
-          placeholder="请输入一级分类"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.oneLevelClassify" size="mini" clearable placeholder="请输入一级分类"
+                   @focus="chooseTreeReferForQuery('MATERIALCLASSIFY_PARAM', false, '一级物料分类')"
+                   style="width: 200px">
+          <el-option v-for="item in classOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </el-form-item>
       <el-form-item label="二级分类" prop="twoLevelClassify">
-        <el-input
-          v-model="queryParams.twoLevelClassify"
-          placeholder="请输入二级分类"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="物料" prop="material">
-        <el-input
-          v-model="queryParams.material"
-          placeholder="请输入物料"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.twoLevelClassify" size="mini" clearable placeholder="请输入二级分类"
+                   @focus="chooseTreeReferForQuery('MATERIALCLASSIFY_PARAM', false, '二级物料分类')"
+                   style="width: 200px">
+          <el-option v-for="item in classOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -85,18 +57,6 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['goal_management:annualSaleGoalDetails:edit']"
-        >修改
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
           type="danger"
           plain
           icon="el-icon-delete"
@@ -123,31 +83,23 @@
 
     <el-table v-loading="loading" :data="annualSaleGoalDetailsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="id唯一标识" align="center" prop="id"/>
-      <el-table-column label="编码" align="center" prop="code"/>
-      <el-table-column label="销售组织" align="center" prop="saleOrg"/>
-      <el-table-column label="销售区域" align="center" prop="saleZone"/>
-      <el-table-column label="客户" align="center" prop="custom"/>
-      <el-table-column label="负责人" align="center" prop="creator"/>
-      <el-table-column label="一级分类编码" align="center" prop="oneLevelClassifyCode"/>
-      <el-table-column label="一级分类" align="center" prop="oneLevelClassify"/>
-      <el-table-column label="二级分类编码" align="center" prop="twoLevelClassifyCode"/>
-      <el-table-column label="二级分类编码" align="center" prop="twoLevelClassify"/>
-      <el-table-column label="物料编码" align="center" prop="materialCode"/>
-      <el-table-column label="物料" align="center" prop="material"/>
-      <el-table-column label="一月目标" align="center" prop="januaryGoal"/>
-      <el-table-column label="二月目标" align="center" prop="februaryGoal"/>
-      <el-table-column label="三月目标" align="center" prop="marchGoal"/>
-      <el-table-column label="四月目标" align="center" prop="aprilGoal"/>
-      <el-table-column label="五月目标" align="center" prop="mayGoal"/>
-      <el-table-column label="六月目标" align="center" prop="juneGoal"/>
-      <el-table-column label="七月目标" align="center" prop="julyGoal"/>
-      <el-table-column label="八月目标" align="center" prop="augustGoal"/>
-      <el-table-column label="九月目标" align="center" prop="septemberGoal"/>
-      <el-table-column label="十月目标" align="center" prop="octoberGoal"/>
-      <el-table-column label="十一月目标" align="center" prop="novemberGoal"/>
-      <el-table-column label="十二月目标" align="center" prop="decemberGoal"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="编码" align="center" prop="code" width="180"/>
+      <el-table-column label="目标名称" align="center" prop="goalName" width="180"/>
+      <el-table-column label="单据日期" align="center" prop="documentDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.documentDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="年度" align="center" prop="annual" width="180"/>
+      <el-table-column label="制单人" align="center" prop="creator" width="180"/>
+      <el-table-column label="部门" align="center" prop="dept" width="180"/>
+      <el-table-column label="目标类型" align="center" prop="goalCategory" width="180"/>
+      <el-table-column label="目标值汇总" align="center" prop="goalTotal" width="180"/>
+      <el-table-column label="销售区域" align="center" prop="saleZone" width="220"/>
+      <el-table-column label="一级分类" align="center" prop="oneLevelClassify" width="180"/>
+      <el-table-column label="二级分类" align="center" prop="twoLevelClassify" width="180"/>
+      <el-table-column label="备注" align="center" prop="notes" width="180"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -178,7 +130,7 @@
     />
 
     <!-- 添加或修改年度销售目标明细对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-drawer :title="title" :visible.sync="open" direction="rtl" :before-close="handleClose" size="100%">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="编码" prop="code">
           <el-input v-model="form.code" placeholder="请输入编码"/>
@@ -254,7 +206,9 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    </el-dialog>
+    </el-drawer>
+
+    <TreeRefers ref="treeQuery" @doSubmit="selectionsToInputForQuery" :single="true"/>
   </div>
 </template>
 
@@ -267,8 +221,15 @@ import {
   updateAnnualSaleGoalDetails
 } from "@/api/business/spd/goal_management/annualSaleGoalDetails";
 
+// 树形参照
+import TreeRefers from '@/components/Refers/treeRefer.vue'
+import ElPopoverSelectV2 from "@/components/popover-select-v2"
+
 export default {
   name: "AnnualSaleGoalDetails",
+  components: {
+    TreeRefers, ElPopoverSelectV2
+  },
   data() {
     return {
       // 遮罩层
@@ -294,33 +255,53 @@ export default {
         pageNum: 1,
         pageSize: 10,
         code: null,
-        saleOrg: null,
-        saleZone: null,
-        custom: null,
+        goalName: null,
+        documentDate: null,
+        annual: null,
+        creatorCode: null,
         creator: null,
+        deptCode: null,
+        dept: null,
+        goalCategory: null,
+        goalTotal: null,
+        notes: null,
+        documentStatus: null,
+        delFlag: null,
+        saleZoneCode: null,
+        saleZone: null,
         oneLevelClassifyCode: null,
         oneLevelClassify: null,
         twoLevelClassifyCode: null,
-        twoLevelClassify: null,
-        materialCode: null,
-        material: null,
-        januaryGoal: null,
-        februaryGoal: null,
-        marchGoal: null,
-        aprilGoal: null,
-        mayGoal: null,
-        juneGoal: null,
-        julyGoal: null,
-        augustGoal: null,
-        septemberGoal: null,
-        octoberGoal: null,
-        novemberGoal: null,
-        decemberGoal: null
+        twoLevelClassify: null
       },
       // 表单参数
-      form: {},
+      form: {
+        id: null,
+        code: null,
+        goalName: null,
+        documentDate: null,
+        annual: null,
+        creatorCode: null,
+        creator: null,
+        deptCode: null,
+        dept: null,
+        goalCategory: null,
+        goalTotal: null,
+        notes: null,
+        documentStatus: null,
+        delFlag: null,
+        saleZoneCode: null,
+        saleZone: null,
+        oneLevelClassifyCode: null,
+        oneLevelClassify: null,
+        twoLevelClassifyCode: null,
+        twoLevelClassify: null
+      },
       // 表单校验
-      rules: {}
+      rules: {},
+      // 树形参照
+      referCondition: {type: '', isPage: true, title: '', index: null},
+      classOptions: []
     };
   },
   created() {
@@ -374,6 +355,7 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
+      console.log(this.queryParams);
       this.getList();
     },
     /** 重置按钮操作 */
@@ -439,7 +421,39 @@ export default {
       this.download('goal_management/annualSaleGoalDetails/export', {
         ...this.queryParams
       }, `annualSaleGoalDetails_${new Date().getTime()}.xlsx`)
-    }
+    },
+    // 树形参照
+    chooseTreeReferForQuery(type, isPage, title) {
+      this.referCondition.type = type
+      this.referCondition.isPage = isPage
+      this.referCondition.title = title
+      this.$refs.treeQuery.init(this.referCondition)
+    },
+    selectionsToInputForQuery(selection) {
+      this.classOptions.push(selection)
+      if (this.referCondition.title === '一级物料分类') {
+        if (selection.code.length !== 1) {
+          return this.$message.info('请在一级分类下选择')
+        }
+        this.queryParams.oneLevelClassifyCode = selection.code
+        this.queryParams.oneLevelClassify = selection.name
+      } else if (this.referCondition.title === '二级物料分类') {
+        if (selection.code.length !== 4) {
+          return this.$message.info('请在二级分类下选择')
+        }
+        this.queryParams.twoLevelClassifyCode = selection.code
+        this.queryParams.twoLevelClassify = selection.name
+      }
+    },
+    // 关闭抽屉
+    handleClose(done) {
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          done();
+          this.resetQuery()
+        })
+        .catch(_ => {});
+    },
   }
 };
 </script>