目标管理-页面调整；

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

@@ -128,36 +128,6 @@
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-grape"
-          size="mini"
-          :disabled="multiple"
-        >提交
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="info"
-          plain
-          icon="el-icon-upload2"
-          size="mini"
-          @click="handleImport"
-        >导入</el-button>
-      </el-col>
-      <el-col :span="1.5">
         <el-dropdown @command="handleCommand">
           <el-button type="warning" plain icon="el-icon-download" size="mini">
             导出<i class="el-icon-arrow-down el-icon--right"></i>
@@ -171,7 +141,6 @@
     </el-row>
 
     <el-table v-loading="loading" :data="annualSaleGoalList" @selection-change="handleSelectionChange" v-horizontal-scroll>
-      <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="documentDate" width="180">
@@ -210,6 +179,18 @@
             @click="handleDelete(scope.row)"
           >删除
           </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleSubmit(scope.row)"
+          >提交</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleReback(scope.row)"
+          >收回</el-button>
         </template>
       </el-table-column>
     </el-table>

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

@@ -139,36 +139,6 @@
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-grape"
-          size="mini"
-          :disabled="multiple"
-        >提交
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="info"
-          plain
-          icon="el-icon-upload2"
-          size="mini"
-          @click="handleImport"
-        >导入</el-button>
-      </el-col>
-      <el-col :span="1.5">
         <el-dropdown @command="handleCommand">
           <el-button type="warning" plain icon="el-icon-download" size="mini">
             导出<i class="el-icon-arrow-down el-icon--right"></i>
@@ -184,7 +154,6 @@
     </el-row>
 
     <el-table v-loading="loading" :data="annualSaleGoalMergeList" @selection-change="handleSelectionChange" v-horizontal-scroll>
-      <el-table-column type="selection" width="55" align="center"/>
       <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">
@@ -224,6 +193,18 @@
             @click="handleDelete(scope.row)"
           >删除
           </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleSubmit(scope.row)"
+          >提交</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleReback(scope.row)"
+          >收回</el-button>
         </template>
       </el-table-column>
     </el-table>

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

@@ -154,36 +154,6 @@
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-grape"
-          size="mini"
-          :disabled="multiple"
-        >提交
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="info"
-          plain
-          icon="el-icon-upload2"
-          size="mini"
-          @click="handleImport"
-        >导入</el-button>
-      </el-col>
-      <el-col :span="1.5">
         <el-dropdown @command="handleCommand">
           <el-button type="warning" plain icon="el-icon-download" size="mini">
             导出<i class="el-icon-arrow-down el-icon--right"></i>
@@ -197,7 +167,6 @@
     </el-row>
 
     <el-table v-loading="loading" :data="monthGoalMergeList" @selection-change="handleSelectionChange" v-horizontal-scroll>
-      <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="编码" align="center" prop="code"/>
       <el-table-column label="目标名称" align="center" prop="goalName"/>
       <el-table-column label="单据日期" align="center" prop="documentDate" width="180">
@@ -236,6 +205,18 @@
             @click="handleDelete(scope.row)"
           >删除
           </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleSubmit(scope.row)"
+          >提交</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleReback(scope.row)"
+          >收回</el-button>
         </template>
       </el-table-column>
     </el-table>

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

@@ -126,36 +126,6 @@
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-grape"
-          size="mini"
-          :disabled="multiple"
-        >提交
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="info"
-          plain
-          icon="el-icon-upload2"
-          size="mini"
-          @click="handleImport"
-        >导入</el-button>
-      </el-col>
-      <el-col :span="1.5">
         <el-dropdown @command="handleCommand">
           <el-button type="warning" plain icon="el-icon-download" size="mini">
             导出<i class="el-icon-arrow-down el-icon--right"></i>
@@ -168,7 +138,6 @@
       </el-col>
     </el-row>
     <el-table v-loading="loading" :data="monthReturnGoalList" @selection-change="handleSelectionChange" v-horizontal-scroll>
-      <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="编码" align="center" prop="code"/>
       <el-table-column label="目标名称" align="center" prop="goalName"/>
       <el-table-column label="单据日期" align="center" prop="documentDate" width="180">
@@ -207,6 +176,18 @@
             @click="handleDelete(scope.row)"
           >删除
           </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleSubmit(scope.row)"
+          >提交</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleReback(scope.row)"
+          >收回</el-button>
         </template>
       </el-table-column>
     </el-table>

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

@@ -129,36 +129,6 @@
       </el-button>
     </el-col>
     <el-col :span="1.5">
-      <el-button
-        type="danger"
-        plain
-        icon="el-icon-delete"
-        size="mini"
-        :disabled="multiple"
-        @click="handleDelete"
-      >删除
-      </el-button>
-    </el-col>
-    <el-col :span="1.5">
-      <el-button
-        type="primary"
-        plain
-        icon="el-icon-grape"
-        size="mini"
-        :disabled="multiple"
-      >提交
-      </el-button>
-    </el-col>
-    <el-col :span="1.5">
-      <el-button
-        type="info"
-        plain
-        icon="el-icon-upload2"
-        size="mini"
-        @click="handleImport"
-      >导入</el-button>
-    </el-col>
-    <el-col :span="1.5">
       <el-dropdown @command="handleCommand">
         <el-button type="warning" plain icon="el-icon-download" size="mini">
           导出<i class="el-icon-arrow-down el-icon--right"></i>
@@ -172,7 +142,6 @@
     </el-col>
   </el-row>
   <el-table v-loading="loading" :data="monthReturnMergeList" @selection-change="handleSelectionChange" v-horizontal-scroll>
-    <el-table-column type="selection" width="55" align="center"/>
     <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">
@@ -212,6 +181,18 @@
           @click="handleDelete(scope.row)"
         >删除
         </el-button>
+        <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleSubmit(scope.row)"
+          >提交</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleReback(scope.row)"
+          >收回</el-button>
       </template>
     </el-table-column>
   </el-table>

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

@@ -127,36 +127,6 @@
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-grape"
-          size="mini"
-          :disabled="multiple"
-        >提交
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="info"
-          plain
-          icon="el-icon-upload2"
-          size="mini"
-          @click="handleImport"
-        >导入</el-button>
-      </el-col>
-      <el-col :span="1.5">
         <el-dropdown @command="handleCommand">
           <el-button type="warning" plain icon="el-icon-download" size="mini">
             导出<i class="el-icon-arrow-down el-icon--right"></i>
@@ -170,7 +140,6 @@
     </el-row>
 
     <el-table v-loading="loading" :data="monthSaleGoalList" @selection-change="handleSelectionChange" v-horizontal-scroll>
-      <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="编码" align="center" prop="code"/>
       <el-table-column label="目标名称" align="center" prop="goalName"/>
       <el-table-column label="单据日期" align="center" prop="documentDate" width="180">
@@ -209,6 +178,18 @@
             @click="handleDelete(scope.row)"
           >删除
           </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleSubmit(scope.row)"
+          >提交</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleReback(scope.row)"
+          >收回</el-button>
         </template>
       </el-table-column>
     </el-table>

src/views/business/spd/target/targetMk/add.vue

@@ -35,18 +35,6 @@
               />
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="1.5">
-            <el-form-item label="包含下级组织" >
-              <el-select v-model="form.includeOrg" size="mini" style="width: 200px">
-                <el-option
-                  v-for="dict in dict.type.sys_yes_no"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
           <el-col :span="1.5">
             <el-form-item label="模板" prop="template">
               <dr-popover-select size="mini" v-model="form.templateName" title="模板" type="MK_TARGET_TEMPLATE_PARAM" :dataMapping="{
@@ -57,6 +45,28 @@
               </dr-popover-select>
             </el-form-item>
           </el-col>
+          <el-col :span="1.5">
+            <el-form-item label="物料分类">
+
+              <!-- <el-select
+                v-model="form.mat"
+                size="mini"
+                clearable
+                @focus="chooseTreeRefer('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-popover-tree-select size="mini" v-model="form.matName" title="物料分类" referName="MATERIALCLASSIFY_PARAM" :dataMapping="{
+                  mat: 'id',
+                  matName: 'name',
+                }" :source.sync="form"
+              >
+              </el-popover-tree-select>
+
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-card shadow="never">
           <el-descriptions title="模板信息">
@@ -70,7 +80,6 @@
             </el-descriptions-item>
             <el-descriptions-item label="维度">
               <div v-for="d in template.dimensionalitys">
-                <!-- <el-tag size="small">{{d.dimensionality}}</el-tag> -->
                 <div v-for="dict in dict.type.mk_dimensionality" v-if="d.dimensionality == dict.value">
                   <el-tag size="small">{{dict.label}}</el-tag>
                 </div>
@@ -78,7 +87,6 @@
             </el-descriptions-item>
             <el-descriptions-item label="指标">
               <div v-for="d in template.indexs">
-                <!-- <el-tag size="small">{{d.target}}</el-tag> -->
                 <div v-for="dict in dict.type.mk_index_type" v-if="d.target == dict.value">
                   <el-tag size="small">{{dict.label}}</el-tag>
                 </div>
@@ -106,6 +114,8 @@
         </el-col>
       </div>
     </el-card>
+
+    <TreeRefers ref="tree" @doSubmit="selectionsToInput2" :single="true"/>
   </div>
 </template>
 
@@ -113,11 +123,17 @@
 import Item from './item.vue'
 import { getTargetTemplate,getHeaderData } from "@/api/business/spd/starget/targetTemplate";
 import { getTarget,addTarget,updateTarget } from "@/api/business/spd/starget/target";
+import TreeRefers from '@/components/Refers/sigleTreeRefer.vue'
+  
 export default {
   name: 'add',
   dicts: ['sys_yes_no','mk_periodic_unit','mk_dimensionality','mk_index_type','mk_expansion_mode'],
   props: ['pageStu','row', 'disable'],
-  components: {Item},
+  // components: {Item,TreeRefers},
+  components: {
+    ElPopoverTreeSelect: () =>
+      import("@/components/popover-tree-select/index.vue"),
+  },
   model: {
     prop: 'isList',
     event: 'jugislist'
@@ -146,6 +162,12 @@ export default {
       isItem:false,
       //是否为最新模板
       latestTemplate:false,
+      referCondition: {
+        type: '',
+        isPage: true,
+        title: ''
+      },
+      classOptions: [],
     }
   },
   async created() {
@@ -174,6 +196,7 @@ export default {
   methods: {
     //保存
     async useSave(){
+      console.log("this.form",this.form);
       let passrule = false;
       this.$refs["form"].validate((valid) => {
         if (valid) {
@@ -248,6 +271,18 @@ export default {
         }
       })
     },
+    // 树形选择
+    chooseTreeRefer(type, isPage, title) {
+      this.referCondition.type = type
+      this.referCondition.isPage = isPage
+      this.referCondition.title = title
+      this.$refs.tree.init(this.referCondition)
+    },
+    selectionsToInput2(selection) {
+      this.classOptions.push(selection)
+      this.form.mat = selection.id
+      this.form.matName = selection.name
+    },
   }
 }
 </script>

src/views/business/spd/target/targetMk/index.vue

@@ -173,7 +173,7 @@
                 <el-button type="text" size="mini" @click="useDel(scope.row)">删除</el-button>
               </div>
               <div v-if="scope.row.status == '1'">
-                <el-button type="text" size="mini" @click="useRevocation(scope.row)">撤回</el-button>
+                <el-button type="text" size="mini" @click="useRevocation(scope.row)">收回</el-button>
               </div>
             </template>
           </el-table-column>

src/views/business/spd/target/targetMk/item.vue

@@ -26,10 +26,30 @@
                 :source.sync="scope.row[head.prop]"
                 :queryParams="additionalCondition"
               />
-              <dr-popover-select size="mini" v-else v-model="scope.row[head.prop].valueName" title="参照选择" :type="scope.row[head.prop].model" :dataMapping="{
-                value: 'id',
-                valueName: 'name',
-              }" :source.sync="scope.row[head.prop]"></dr-popover-select>
+              <el-popover-tree-select 
+                size="mini" 
+                v-if="scope.row[head.prop].model == 'MATERIALCLASSIFY_PARAM'"
+                :valueKey="scope.row[head.prop].valueName" 
+                title="参照选择" 
+                :referName="scope.row[head.prop].model" 
+                :dataMapping="{
+                  value: 'id',
+                  valueName: 'name',
+                }" 
+                :source.sync="scope.row[head.prop]">
+              </el-popover-tree-select>
+              <dr-popover-select 
+                size="mini" 
+                v-else 
+                v-model="scope.row[head.prop].valueName" 
+                title="参照选择" 
+                :type="scope.row[head.prop].model" 
+                :dataMapping="{
+                  value: 'id',
+                  valueName: 'name',
+                }" 
+                :source.sync="scope.row[head.prop]">
+              </dr-popover-select>
             </div>
             <div v-if="scope.row[head.prop].type == 'C' || scope.row[head.prop].type == 'I'">
               <el-input size="mini"  v-model="scope.row[head.prop].value"></el-input>
@@ -71,6 +91,10 @@ export default {
   name: 'item',
   props: ['pageStu','template','form','columns','latestTemplate'],  
   dicts: ['sys_yes_no','mk_periodic_unit','mk_dimensionality','mk_index_type','mk_expansion_mode'],
+  components: {
+    ElPopoverTreeSelect: () =>
+      import("@/components/popover-tree-select/index.vue"),
+  },
   data() {
     return {
       items:[],
@@ -180,6 +204,7 @@ export default {
     },
     //合并已存在和删除的数据
     merge(){
+      console.log('this.items',this.items);
       this.items.push(...this.delItems);
       return this.items;
     },