Merge remote-tracking branch 'origin/dev' into dev

src/api/business/ehr/pm/performance.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 查询绩效列表
+export function listPerformance(query) {
+  return request({
+    url: '/ehr/pm/performance/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询绩效详细
+export function getPerformance(id) {
+  return request({
+    url: '/ehr/pm/performance/' + id,
+    method: 'get'
+  })
+}

src/api/business/ehr/pm/performanceitem.js

@@ -0,0 +1,35 @@
+import request from '@/utils/request'
+
+// 查询任务详细
+export function getPerformanceItem(id) {
+  return request({
+    url: '/ehr/pm/performanceitem/' + id,
+    method: 'get'
+  })
+}
+
+// 新增绩效明细
+export function addPerformanceItem(data) {
+  return request({
+    url: '/ehr/pm/performanceitem',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改绩效明细
+export function updatePerformanceItem(data) {
+  return request({
+    url: '/ehr/pm/performanceitem',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除绩效明细
+export function delPerformanceItem(id) {
+  return request({
+    url: '/ehr/pm/performanceitem/' + id,
+    method: 'delete'
+  })
+}

src/api/business/ehr/pm/stage.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询阶段列表
+export function listStage(query) {
+  return request({
+    url: '/ehr/pm/stage/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询阶段详细
+export function getStage(id) {
+  return request({
+    url: '/ehr/pm/stage/' + id,
+    method: 'get'
+  })
+}
+
+// 新增阶段控制
+export function addStage(data) {
+  return request({
+    url: '/ehr/pm/stage',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改阶段控制
+export function updateStage(data) {
+  return request({
+    url: '/ehr/pm/stage',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除阶段控制
+export function delStage(id) {
+  return request({
+    url: '/ehr/pm/stage/' + id,
+    method: 'delete'
+  })
+}
+
+// 发布阶段
+export function publishStage(data) {
+  return request({
+    url: '/ehr/pm/stage/publish',
+    method: 'post',
+    data: data
+  })
+}

src/api/business/spd/bo/task.js

@@ -35,7 +35,7 @@ export function updateTask(data) {
   })
 }
 
-// 删除岗位
+// 删除任务
 export function delTask(taskId) {
   return request({
     url: '/mk/bo/task/' + taskId,

src/api/business/spd/goal_management/annualSaleGoal.js

@@ -50,4 +50,13 @@ export function submit(id) {
     method: 'post',
     data: id
   })
+}
+
+//重新提交
+export function resubmit(id) {
+  return request({
+    url: '/goal_management/annualSaleGoal/resubmit',
+    method: 'post',
+    data: id
+  })
 }

src/components/popover-select-v2/multiple.vue

@@ -244,9 +244,9 @@ export default {
     >
       <el-tag
         v-for="(tag, index) in lastSelectData"
-        :size="size"
         hit
         closable
+        :size="size"
         @close="useDelete(index)"
         style="margin-right: 5px"
       >
@@ -258,6 +258,7 @@ export default {
 <style scoped>
 .popover-select-v2 .el-input {
   width: inherit;
+  height: 100%;
 }
 .popover-select-v2 .el-input .el-icon-search {
   cursor: pointer;
@@ -273,4 +274,5 @@ export default {
 ::v-deep .el-table--mini .el-table__cell {
   height: 50px;
 }
+
 </style>

src/components/query-scheme/colums.js

@@ -0,0 +1,27 @@
+export const Columns = [
+  {
+    item:{
+      key: 'candidate',
+      title:'候选条件',
+    },
+    attr:{}
+  },
+  {
+    item:{
+      key: 'options',
+      title:'操作符',
+      width: 150,
+    },
+    attr:{}
+  },
+  {
+    item:{
+      key: 'value',
+      title:'值',
+    },
+    attr:{
+      is:'el-input',
+    }
+  },
+
+]

src/components/query-scheme/index.vue

@@ -0,0 +1,319 @@
+<script>
+import { Columns } from "./colums";
+export default {
+  name: "Inquire",
+  components: {
+    Sizer: () => import("./sizer/index.vue"),
+  },
+  props: {
+    size: {
+      type: String,
+      default: "mini",
+    },
+    // 候选条件
+    candidate: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  data() {
+    return {
+      title: "查询方案",
+      visible: false,
+      menuVisible: false,
+      testModeCode: {},
+      CurrentRow: {},
+      schemeData: [
+        {
+          id: 1,
+          name: "方案1",
+        },
+        {
+          id: 2,
+          name: "方案2",
+        },
+        {
+          id: 3,
+          name: "方案3",
+        },
+        {
+          id: 4,
+          name: "方案4",
+        },
+      ],
+      tableData: [
+        {
+          candidate: "orderCode",
+          options: "like",
+          value: "12315465416546",
+          operators: [
+            { label: "等于", value: "eq" },
+            { label: "模糊", value: "like" },
+          ],
+          attr: { is: "el-input" },
+        },
+        {
+          candidate: "date",
+          options: "range",
+          value: "3333",
+          operators: [{ label: "范围", value: "range" }],
+          attr: { is: "el-input" },
+        },
+      ],
+    };
+  },
+  computed: {
+    $dicts: {
+      get() {
+        console.log(this.tableData, "tableData");
+        console.log(this.candidate, "candidate");
+        return [];
+      },
+      set() {},
+    },
+  },
+  methods: {
+    open() {
+      this.visible = true;
+    },
+    onClose() {
+      this.visible = false;
+    },
+    // 清空值
+    onReset() {
+      this.tableData = this.tableData.map((item) => {
+        return {
+          ...item,
+          value: "",
+        };
+      });
+    },
+    // 新增方案
+    addCase() {
+      this.$prompt("请输入方案名称", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        inputPattern: /\s*\S+?/,
+        inputErrorMessage: "方案名称不能为空",
+      })
+        .then(({ value }) => {
+          let caseData = this.tableData.map((item) => {
+            return {
+              ...item,
+              value: "",
+            };
+          });
+          console.log(value, caseData, "caseData");
+        })
+        .catch(() => {});
+    },
+    // 重命名
+    renameRow(prop) {
+      console.log(prop, "renameRow");
+      this.$prompt("请输入新方案名称", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        inputPattern: /\s*\S+?/,
+        inputErrorMessage: "方案名称不能为空",
+      })
+        .then(({ value }) => {})
+        .catch(() => {});
+    },
+    // 删除方案
+    deleteRow(prop) {
+      console.log(prop, "deleteRow");
+    },
+    // 设置为默认方案
+    setRow(prop) {
+      console.log(prop, "setRow");
+    },
+    onClick(row) {
+      console.log(row);
+    },
+    // 方案右键
+    rightClick(row, column, event) {
+      this.testModeCode = row.testModeCode;
+
+      // 先把模态框关死，目的是 第二次或者第n次右键鼠标的时候 它默认的是true
+      this.menuVisible = false;
+      // 显示模态窗口，跳出自定义菜单栏
+      this.menuVisible = true;
+      //关闭浏览器右键默认事件
+      event.preventDefault();
+
+      this.CurrentRow = row;
+
+      var menu = document.querySelector(".menu");
+
+      this.styleMenu(menu, event);
+    },
+    foo() {
+      // 取消鼠标监听事件 菜单栏
+      this.menuVisible = false;
+
+      // 关掉监听
+      document.removeEventListener("click", this.foo);
+    },
+    styleMenu(menu) {
+      menu.style.left = event.offsetX + 18 + "px";
+
+      menu.style.top = event.clientY - 50 + "px";
+
+      // 给整个document新增监听鼠标事件，点击任何位置执行foo方法
+      document.addEventListener("click", this.foo);
+    },
+  },
+  created() {},
+};
+</script>
+
+<template>
+  <el-button :size="size" @click="open">
+    {{ title }}
+    <el-dialog
+      width="850px"
+      class="inquire"
+      append-to-body
+      :visible.sync="visible"
+      :show-close="false"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <div slot="title" style="display: flex; justify-content: space-between">
+        <h4 style="margin: 0">{{ title }}</h4>
+        <div>
+          <el-button
+            type="primary"
+            :size="size"
+            icon="el-icon-search"
+            @click.native.prevent="$emit('submit', tableData)"
+            >筛 选</el-button
+          >
+          <el-button
+            :size="size"
+            icon="el-icon-refresh-right"
+            @click.native.prevent="onReset"
+            >清 空</el-button
+          >
+          <el-button :size="size" @click.native.prevent="onClose"
+            >取 消</el-button
+          >
+        </div>
+      </div>
+      <el-container>
+        <el-aside
+          width="220px"
+          style="
+            height: 350px;
+            border-right: 1px solid rgb(228, 228, 228);
+            background-color: rgb(255, 255, 255);
+          "
+        >
+          <el-table
+            :data="schemeData"
+            :show-header="false"
+            :height="320"
+            empty-text=" "
+            show-overflow-tooltip
+            highlight-current-row
+            @cell-click="onClick"
+            @row-contextmenu="rightClick"
+          >
+            <el-table-column prop="name">
+              <template slot-scope="scope">
+                <i class="el-icon-document"></i>
+                {{ scope.row.name }}
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <div id="contextmenu" class="menu" v-show="menuVisible">
+            <div class="contextmenu__item" @click="renameRow(CurrentRow)">
+              重命名
+            </div>
+            <div class="contextmenu__item" @click="deleteRow(CurrentRow)">
+              删除
+            </div>
+            <div class="contextmenu__item" @click="setRow(CurrentRow)">
+              设置为默认方案
+            </div>
+          </div>
+
+          <el-row style="position: absolute; bottom: 16px; left: 10">
+            <el-col>
+              <el-button
+                type="primary"
+                :size="size"
+                @click.native.prevent="addCase"
+                >保存方案
+              </el-button>
+            </el-col>
+          </el-row>
+        </el-aside>
+
+        <Sizer v-model="tableData" :size="size" :candidate="candidate"></Sizer>
+      </el-container>
+    </el-dialog>
+  </el-button>
+</template>
+
+<style lang="scss" scoped>
+::v-deep.inquire .el-dialog__header {
+  padding: 15px 15px 10px;
+}
+::v-deep.inquire .el-dialog__body {
+  padding: 5px;
+  .el-aside,
+  .el-main {
+    padding: 0 10px;
+  }
+}
+
+::v-deep.el-table::before {
+  display: none;
+}
+
+::v-deep.el-table {
+  th,
+  td,
+  th.is-leaf {
+    border: none;
+  }
+
+  .el-table__cell {
+    padding: 2px 0;
+  }
+}
+
+// 菜单样式
+.contextmenu__item {
+  display: block;
+  line-height: 28px;
+  text-align: center;
+}
+.contextmenu__item:not(:last-child) {
+  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+}
+.menu {
+  position: absolute;
+  background-color: #fff;
+  width: 100px;
+  /*height: 106px;*/
+  font-size: 12px;
+  color: #444040;
+  border-radius: 4px;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  border-radius: 3px;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
+  white-space: nowrap;
+  z-index: 1000;
+}
+.contextmenu__item:hover {
+  cursor: pointer;
+  background: #66b1ff;
+  border-color: #66b1ff;
+  color: #fff;
+}
+</style>

src/components/query-scheme/sizer/index.vue

@@ -0,0 +1,314 @@
+<script>
+import { getOperators } from "./operators";
+import { Columns } from "../colums";
+import { getDicts as getDicts } from "@/api/system/dict/data";
+export default {
+  name: "Sizer",
+  props: {
+    value: {
+      type: [Array],
+      require: true,
+    },
+    candidate: {
+      type: [Array],
+      require: true,
+    },
+  },
+  components: {
+    ElDraggable: () => import("@/components/draggable/index.vue"),
+    ElFileUpload: () => import("@/components/FileUpload/index.vue"),
+    ElPopoverSelectV2: () => import("@/components/popover-select-v2/index.vue"),
+    ElPopoverMultipleSelectV2: () =>
+      import("@/components/popover-select-v2/multiple.vue"),
+    ElPopoverTreeSelect: () =>
+      import("@/components/popover-tree-select/index.vue"),
+    ElPopoverMultipleTreeSelect: () =>
+      import("@/components/popover-tree-select/multiple.vue"),
+    ElDateWrapper: () => import("@/components/date-wrapper/index.vue"),
+  },
+  computed: {
+    innerValue: {
+      get() {
+        return this.$props.value;
+      },
+      set(value) {
+        this.$emit("input", value);
+      },
+    },
+  },
+  data() {
+    return {
+      showColumns: Columns,
+    };
+  },
+  methods: {
+    // 增
+    onRowAdd() {
+      this.innerValue.push({
+        ...this.$init.params([...this.showColumns]),
+        attr: {
+          is: "el-input",
+        },
+      });
+    },
+    // 删
+    onRowRemove(prop) {
+      console.log(prop, "prop");
+      const { $index, row } = prop;
+      this.innerValue.splice($index, 1);
+    },
+    // 条件选择
+    canidateChange(prop) {
+      let { $index, row } = prop;
+
+      let selectValue = this.candidate.filter(
+        ({ item }) => item.key === row.candidate
+      )[0];
+
+      let operators = selectValue
+        ? getOperators(this.judgeOperatorType(selectValue.attr))
+        : [];
+
+      let attr = selectValue.attr ? selectValue.attr : { is: "el-input" };
+      console.log(attr.is, "attr");
+
+      // 方案存储
+      this.innerValue = this.innerValue.map((tableItem, index) => {
+        if (row.candidate === tableItem.candidate && $index === index) {
+          tableItem.options = "";
+
+          tableItem.value = "";
+
+          tableItem.operators = operators;
+
+          tableItem.attr = attr;
+        }
+
+        return tableItem;
+      });
+
+      // 值框的选择
+      // this.showColumns = this.showColumns
+    },
+    // 操作选择
+    optionChange(prop) {
+      console.log(prop, "prop");
+      // this.$emit("update:value",this.innerValue);
+    },
+    judgeOperatorType(type) {
+      switch (type.is) {
+        case "el-popover-multiple-select-v2":
+          return "array";
+
+        case "el-popover-multiple-tree-select":
+          return "array";
+
+        case "el-input-number":
+          return "number";
+
+        case "el-date-picker":
+          return "datetime";
+
+        case "el-select":
+          let dictName = type.dictName;
+          if (
+            dictName === "sys_number_yes_no" ||
+            dictName === "sys_yes_no" ||
+            dictName === "sys_true_false"
+          ) {
+            return "boolean";
+          }
+          return "string";
+
+        default:
+          return "string";
+      }
+    },
+  },
+  created() {},
+};
+</script>
+
+<template>
+  <el-main>
+    <el-table
+      :data="innerValue"
+      style="width: 100%"
+      :show-header="false"
+      :height="320"
+      empty-text=" "
+      v-bind="$attrs"
+      v-on="$listeners"
+    >
+      <el-table-column
+        v-for="({ item, attr }, index) in showColumns"
+        :key="item.key + index"
+        :prop="item.key"
+        :label="item.title"
+        :fixed="item.fixed"
+        :width="item.width || 200"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          <el-select
+            v-if="item.key === 'candidate'"
+            v-model="scope.row[item.key]"
+            :size="$attrs.size"
+            filterable
+            placeholder="请选择"
+            @change="canidateChange(scope)"
+          >
+            <el-option
+              v-for="(c, index) in candidate"
+              :key="index + c.item.key"
+              :label="c.item.title"
+              :value="c.item.key"
+            ></el-option>
+          </el-select>
+
+          <el-select
+            v-if="item.key === 'options'"
+            v-model="scope.row[item.key]"
+            :size="$attrs.size"
+            placeholder="请选择"
+            @change="optionChange"
+          >
+            <el-option
+              v-for="op in scope.row['operators']"
+              :key="op.value"
+              :label="op.label"
+              :value="op.value"
+            >
+            </el-option>
+          </el-select>
+
+          <template v-if="item.key === 'value'">
+            <component
+              v-if="scope.row.attr.is === 'el-select'"
+              v-bind="scope.row.attr"
+              :size="$attrs.size"
+              v-model="scope.row[item.key]"
+            >
+              <template>
+                <el-option
+                  v-for="item in dict.type[attr.dictName]"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </template>
+            </component>
+
+            <component
+              v-if="scope.row.attr.is === 'el-popover-select-v2'"
+              v-bind="scope.row.attr"
+              v-model="scope.row[item.key]"
+              :title="item.title"
+              :size="$attrs.size"
+              :source.sync="scope.row"
+              style="width: 100%"
+            ></component>
+
+            <component
+              v-if="scope.row.attr.is === 'el-popover-multiple-select-v2'"
+              v-bind="scope.row.attr"
+              v-model="scope.row[item.key]"
+              :title="item.title"
+              :size="$attrs.size"
+              :source.sync="scope.row"
+              style="width: 100%"
+            ></component>
+
+            <component
+              v-if="scope.row.attr.is === 'el-popover-tree-select'"
+              v-bind="scope.row.attr"
+              v-model="scope.row[item.key]"
+              :size="$attrs.size"
+              :source.sync="scope.row"
+              @change="$emit('submit')"
+              style="width: 100%"
+            >
+            </component>
+
+            <component
+              v-if="scope.row.attr.is === 'el-popover-multiple-tree-select'"
+              v-bind="scope.row.attr"
+              v-model="scope.row[item.key]"
+              :size="$attrs.size"
+              :source.sync="scope.row"
+              style="width: 100%"
+            >
+            </component>
+
+            <component
+              v-if="scope.row.attr.is === 'el-date-wrapper'"
+              v-bind="scope.row.attr"
+              v-model="scope.row[item.key]"
+              :size="$attrs.size"
+              :source.sync="scope.row"
+              style="width: 100%"
+            >
+            </component>
+
+            <component
+              v-if="scope.row.attr.is === 'el-input'"
+              v-bind="scope.row.attr"
+              :size="$attrs.size"
+              v-model="scope.row[item.key]"
+              style="width: 100%"
+            >
+            </component>
+          </template>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" width="50">
+        <template slot-scope="scope">
+          <i
+            class="el-icon-delete"
+            @click.prevent="onRowRemove(scope)"
+            style="cursor: pointer"
+          ></i>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-row>
+      <el-col style="padding-left: 10px">
+        <el-button type="text" @click.native.prevent="onRowAdd">
+          <i class="el-icon-plus"></i>
+          新增筛选条件
+        </el-button>
+      </el-col>
+    </el-row>
+  </el-main>
+</template>
+
+<style lang="scss" scoped>
+::v-deep.el-table::before {
+  display: none;
+}
+
+::v-deep.el-table {
+  th,
+  td,
+  th.is-leaf {
+    border: none;
+  }
+
+  .el-table__cell {
+    padding: 2px 0;
+  }
+  .popover-select-v2 .popover-select-v2_tags,
+  .popover-tree-select .popover-tree-select_tags {
+    left: 15px;
+  }
+  .el-scrollbar__view {
+    padding: 6px 0 0 3px !important;
+  }
+
+  .el-scrollbar__wrap {
+    overflow-x: hidden;
+    margin-right: -2px !important;
+  }
+}
+</style>

src/components/query-scheme/sizer/operators.js

@@ -0,0 +1,94 @@
+const OPERATORS_STRING = [
+  {
+    label: '等于',
+    value: 'eq',
+  },
+  {
+    label: '模糊',
+    value: 'like',
+  },
+];
+
+const OPERATORS_NUMBER = [
+  {
+    label: '等于',
+    value: 'eq',
+  },
+  {
+    label: '大于',
+    value: 'gt',
+  },
+  {
+    label: '小于',
+    value: 'lt',
+  },
+  {
+    label: '大于等于',
+    value: 'gte',
+  },
+  {
+    label: '小于等于',
+    value: 'lte',
+  },
+  {
+    label: '不等于',
+    value: 'ne',
+  },
+];
+
+const OPERATORS_DATE = [
+  {
+    label: '范围',
+    value: 'range',
+  },
+];
+
+const OPERATORS_BOOL = [
+  {
+    label: '等于',
+    value: 'eq',
+  },
+  {
+    label: '不等于',
+    value: 'ne',
+  },
+];
+
+const OPERATORS_ARRAY_MULTIPLE = [
+  {
+    label: '同时包含',
+    value: 'fullSubset',
+  },
+  {
+    label: '包含任一一个',
+    value: 'intersection',
+  },
+];
+
+const OPERATORS_LABEL_VALUE = [
+  {
+    label: '等于',
+    value: 'eq',
+  },
+  {
+    label: '不等于',
+    value: 'ne',
+  },
+];
+
+export const getOperators = (type) => {
+  switch (type) {
+  case 'array':
+    return OPERATORS_ARRAY_MULTIPLE;
+  case 'number':
+    return OPERATORS_NUMBER;
+  case 'datetime':
+    return OPERATORS_DATE;
+  case 'boolean':
+    return OPERATORS_BOOL;
+  case 'label-value':
+    return OPERATORS_LABEL_VALUE;
+  default:
+    return OPERATORS_STRING;
+  }
+}

src/components/super-ux-table/index.vue

@@ -56,15 +56,14 @@ export default {
     storageKey: {
       type: String,
     },
-    showSummary:{
-      type:Boolean,
-      default:false,
+    showSummary: {
+      type: Boolean,
+      default: false,
+    },
+    height: {
+      type: [String, Number],
+      default: () => "auto",
     },
-    height:{
-      type:[String,Number],
-      default:()=>'auto',
-    }
-
   },
   components: {
     ElDictTag: () => import("@/components/DictTag/index.vue"),
@@ -140,7 +139,7 @@ export default {
     },
     // height:{
     //   get(){
-    //     return 100% - 
+    //     return 100% -
     //   },
     //   set(){},
     // }
@@ -164,15 +163,15 @@ export default {
         this.filterData = multiFilter(this.$props.value, newValue);
       },
     },
-    value:{
+    value: {
       handler: function (newValue) {
-        if(this.value.length > 0){
+        if (this.value.length > 0) {
           this.$refs.superUxTable && this.$refs.superUxTable.clearSelection();
         }
       },
       immediate: true,
-      deep:true
-    }
+      deep: true,
+    },
   },
   methods: {
     //
@@ -182,7 +181,6 @@ export default {
     },
     //
     onRowClick(row, column, event) {
-      
       const { radio, checkbox } = this.$props;
       // 单选
       if (radio) {
@@ -190,13 +188,13 @@ export default {
       }
       // 多选
       if (checkbox) {
-        this.$refs.superUxTable.toggleRowSelection(
-          [this.innerValue.find((item) => item.id === row.id)]
-        );
+        this.$refs.superUxTable.toggleRowSelection([
+          this.innerValue.find((item) => item.id === row.id),
+        ]);
       }
     },
     // 宽度
-    onWidth({ column}) {
+    onWidth({ column }) {
       this.innerColumns = this.innerColumns.map(({ item, attr }) => ({
         attr,
         item: {
@@ -250,7 +248,6 @@ export default {
         }
         this.count++;
       });
-     
     },
     // 过滤
     onFilter() {
@@ -290,37 +287,37 @@ export default {
         }
       }
     },
-    getSummaries({ columns, data }){
-      
-      const means = [] // 合计
+    getSummaries({ columns, data }) {
+      const means = []; // 合计
       columns.forEach((column, columnIndex) => {
-          if (columnIndex === 0) {
-              means.push('合计')
-          } else {
-              const values = data.map(item => Number(item[column.property]));
-              
-              let sumColumn = this.showColumns.filter(({item,attr}) => attr.isSummary && item.key === column.property);
+        if (columnIndex === 0) {
+          means.push("合计");
+        } else {
+          const values = data.map((item) => Number(item[column.property]));
+
+          let sumColumn = this.showColumns.filter(
+            ({ item, attr }) => attr.isSummary && item.key === column.property
+          );
 
-              // 合计
-              // if (!values.every(value => isNaN(value))) {
-              if (sumColumn.length) {
-                  means[columnIndex] = values.reduce((prev, curr) => {
-                      const value = Number(curr);
-                      if (!isNaN(value)) {
-                          return prev + curr;
-                      } else {
-                          return prev;
-                      }
-                  }, 0);
-                  means[columnIndex] = means[columnIndex].toFixed(2); 
+          // 合计
+          // if (!values.every(value => isNaN(value))) {
+          if (sumColumn.length) {
+            means[columnIndex] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
               } else {
-                  means[columnIndex] = '';
+                return prev;
               }
-            }
-      })
+            }, 0);
+            means[columnIndex] = means[columnIndex].toFixed(2);
+          } else {
+            means[columnIndex] = "";
+          }
+        }
+      });
       // sums[index] = sums[index] && sums[index].toFixed(2); // 保留2位小数，解决小数合计列
-      return [means]
-			
+      return [means];
     },
   },
   created() {},
@@ -328,9 +325,9 @@ export default {
     this.extendMethod();
   },
   updated() {
-    this.$nextTick(()=>{
+    this.$nextTick(() => {
       this.$refs.superUxTable.doLayout();
-    })
+    });
   },
   destroyed() {},
 };
@@ -357,7 +354,7 @@ export default {
       @header-dragend="onWidth"
       @selection-change="onSelectionChange"
       :header-row-style="{
-        color: '#515a6e' ,
+        color: '#515a6e',
       }"
       style="flex: 1"
     >
@@ -390,7 +387,7 @@ export default {
         :key="item.key + index"
         :field="item.key"
         :title="item.title"
-        :fixed="item.fixed ? 'left' :undefined"
+        :fixed="item.fixed ? 'left' : undefined"
         :width="item.width || 180"
         resizable
         show-overflow
@@ -500,7 +497,7 @@ export default {
         </template>
       </ux-table-column>
       <slot></slot>
-    <!-- </el-table> -->
+      <!-- </el-table> -->
     </ux-grid>
     <div
       style="
@@ -568,7 +565,9 @@ export default {
   }
 }
 
-::v-deep.uxbeautifyTableClass .elx-header--column .elx-resizable.is--line:before{
+::v-deep.uxbeautifyTableClass
+  .elx-header--column
+  .elx-resizable.is--line:before {
   height: 100%;
   background-color: #dfe6ec;
 }

src/views/business/ehr/pm/performance/detail.vue

@@ -0,0 +1,311 @@
+<template>
+  <div>
+    <el-card>
+      <div slot="header" class="clearfix">
+        <span style="font-weight:bold">绩效考核表</span>
+        <div style="float: right; padding: 3px 0" type="text">
+          <el-button size="mini" plain @click="btnBack">返回</el-button>
+          <el-button size="mini" plain @click="btnSubmit">提交</el-button>
+          <el-button size="mini" plain @click="btnCopyItem">复制指标</el-button>
+          <el-button size="mini" plain @click="btnLog">指标修改记录</el-button>
+          <el-button size="mini" plain @click="btnPreviou">上一个</el-button>
+          <el-button size="mini" plain @click="btnNext">下一个</el-button>
+        </div>
+      </div>
+      <div v-loading="loading">
+        <el-descriptions :column="4">
+          <el-descriptions-item label="员工编号">{{form.staff}}</el-descriptions-item>
+          <el-descriptions-item label="员工姓名">{{form.staffName}}</el-descriptions-item>
+          <el-descriptions-item label="入职日期">{{form.dateJoin}}</el-descriptions-item>
+          <el-descriptions-item label="转正日期">{{form.probationComplete}}</el-descriptions-item>
+          <el-descriptions-item label="一级部门">{{form.year}}</el-descriptions-item>
+          <el-descriptions-item label="二级部门">{{form.startTime}}</el-descriptions-item>
+          <el-descriptions-item label="三级部门">{{form.deadlineTime}}</el-descriptions-item>
+          <el-descriptions-item label="职位">{{form.deadlineTime}}</el-descriptions-item>
+          <el-descriptions-item label="评估周期">{{form.year}}</el-descriptions-item>
+          <el-descriptions-item label="评估人编号">{{form.startTime}}</el-descriptions-item>
+          <el-descriptions-item label="评估人姓名">{{form.deadlineTime}}</el-descriptions-item>
+        </el-descriptions>
+        <el-descriptions :column="4">
+          <el-descriptions-item label="个人总结">{{form.deadlineTime}}</el-descriptions-item>
+        </el-descriptions>
+        <el-descriptions :column="4">
+          <el-descriptions-item label="评语">{{form.year}}</el-descriptions-item>
+        </el-descriptions>
+        <div style="float:right">
+          <el-button type="primary" size="mini" @click="btnAddRow">增加指标</el-button>
+          <el-button size="mini" @click="btnUnfold">{{isUnfold == true ? "收起" : "展开"}}</el-button>
+        </div>
+        <el-table size="mini"  :data="form.performanceItem" show-summary :summary-method="getSummaries">
+          <el-table-column label="评估方面" align="center" prop="aspect">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.ehr_pm_aspect" :value="scope.row.aspect"/>
+            </template>
+          </el-table-column>
+          <el-table-column :show-overflow-tooltip="!isUnfold" label="评估指标" align="center" prop="target" />
+          <el-table-column :show-overflow-tooltip="!isUnfold" label="评估说明" align="center" prop="instructions" />
+          <!-- <el-table-column label="评估指标" align="center" prop="target" />
+          <el-table-column label="评估说明" align="center" prop="instructions" /> -->
+          <el-table-column label="角色" align="center" prop="role">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.ehr_pm_role" :value="scope.row.aspect"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="权重(%)" align="center" prop="weight" sortable/>
+          <el-table-column :show-overflow-tooltip="!isUnfold" label="绩效标准" align="center" prop="standard" />
+          <!-- <el-table-column label="绩效标准" align="center" prop="standard" /> -->
+          <el-table-column label="数据来源" align="center" prop="source" />
+          <el-table-column label="自评分（0-100）" align="center" prop="selfScoring" />
+          <el-table-column label="自评语" align="center" prop="selfComment" />
+          <el-table-column label="上级评分（0-100）" align="center" prop="leaderScoring" />
+          <el-table-column label="上级评语" align="center" prop="leaderComment" />
+          <el-table-column label="加权得分" align="center" prop="weightedScore" />
+          <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+              <el-button size="mini" type="text" @click="btnEdit(scope.row)">修改</el-button>
+              <el-button size="mini" type="text" @click="btnDelete(scope.row)">删行</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </el-card>
+    
+    <el-dialog title="指标明细" :visible.sync="rowDataOpen" width="1000px" :close-on-click-modal="false" :show-close="false">
+      <el-form size="mini" label-position="right" ref="rowDataForm" :model="rowData" :rules="rowRules" label-width="80px">
+        <el-form-item label="评估方面" prop="aspect">
+          <el-select v-model="rowData.aspect" >
+            <el-option
+              v-for="dict in dict.type.ehr_pm_aspect"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="评估指标" prop="target">
+          <el-input v-model="rowData.target"></el-input>
+        </el-form-item>
+        <el-form-item label="评估说明" prop="instructions">
+          <el-input type="textarea" v-model="rowData.instructions"></el-input>
+        </el-form-item>
+        <el-form-item label="角色" prop="role">
+          <el-select v-model="rowData.role" >
+            <el-option
+              v-for="dict in dict.type.ehr_pm_role"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="加/减分项" prop="asItem">
+          <el-checkbox v-model="rowData.asItem"></el-checkbox>
+        </el-form-item>
+        <el-form-item label="权重(%)" prop="weight" v-if="!rowData.asItem">
+          <el-input v-model="rowData.weight"></el-input>
+        </el-form-item>
+        <el-form-item label="绩效标准" prop="standard">
+          <el-input type="textarea" v-model="rowData.standard"></el-input>
+        </el-form-item>
+        <el-form-item label="数据来源" prop="source">
+          <el-input v-model="rowData.source"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="btnRowClose">取 消</el-button>
+        <el-button size="mini" type="primary" @click="btnRowConfirm">确 定</el-button>
+      </span>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { getPerformance} from "@/api/business/ehr/pm/performance";
+import { getPerformanceItem,addPerformanceItem,updatePerformanceItem,delPerformanceItem} from "@/api/business/ehr/pm/performanceitem";
+
+export default {
+  name: 'detail',
+  dicts: ['ehr_pm_aspect','ehr_pm_role'],
+  props: ['pageStu','rowId',"ids"],
+  model: {
+    prop: 'isList',
+    event: 'jugislist'
+  },
+  data() {
+    return {
+      //id
+      id:null,
+      //表单
+      form:{},
+      //遮罩
+      loading: false,
+      //单行明细
+      rowData:{},
+      //是否显示行明细弹出层
+      rowDataOpen:false,
+      //当行明细校验规则
+      rowRules:{
+        aspect: [
+          { required: true, message: "评估方面不能为空", trigger: "blur" },
+        ],
+        target: [
+          { required: true, message: "评估指标不能为空", trigger: "blur" },
+        ],
+        instructions: [
+          { required: true, message: "评估说明不能为空", trigger: "blur" },
+        ],
+        role: [
+          { required: true, message: "角色不能为空", trigger: "blur" },
+        ],
+        weight: [
+          { required: true, message: "权重", trigger: "blur" },
+        ],
+        standard: [
+          { required: true, message: "绩效标准不能为空", trigger: "blur" },
+        ],
+        source: [
+          { required: true, message: "数据来源不能为空", trigger: "blur" },
+        ],
+      },
+      //是否展开
+      isUnfold:false,
+      //明细权重合计值
+      weightSum: 0,
+    }
+  },
+  async created() {
+    this.id = this.rowId;
+    this.fetchPerformance(this.id);
+    if(this.pageStu == 'add'){
+    }
+    if(this.pageStu == 'edit' || this.pageStu == 'see') {
+    }
+  },
+  watch: {
+  },
+  methods: {
+    //返回
+    btnBack(){
+      this.$emit('jugislist', true)
+      this.$emit('refresh')
+    },
+    //查询详情
+    async fetchPerformance(id){
+      this.loading = true;
+      await getPerformance(id).then(res => {
+        if (res.code === 200) {
+          this.form = res.data;
+          this.id = res.data.id;
+         }
+         this.loading = false;
+      })
+    },
+    //增行
+    btnAddRow(){
+      this.rowData = {assessId: this.form.id};
+      this.rowDataOpen = true;
+    },
+    //修改
+    async btnEdit(row){
+      await getPerformanceItem(row.id).then(res => {
+        if (res.code === 200) {
+          this.rowData = res.data
+          this.rowDataOpen = true;
+         }
+      })
+    },
+    //删行
+    btnDelete(row){
+      this.$modal.confirm('是否确认删除【"' + row.aspect + '"】数据项？').then(function() {
+        return delPerformanceItem(row.id);
+      }).then(() => {
+        this.fetchPerformance(this.id);
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    //单行明细取消
+    btnRowClose(){
+      this.rowDataOpen = false;
+    },
+    //单行明细确认
+    btnRowConfirm(){
+      this.$refs["rowDataForm"].validate(valid => {
+        if (valid) {
+          if (this.rowData.id != undefined) {
+            updatePerformanceItem(this.rowData).then(response => {
+              this.$modal.msgSuccess("保存成功");
+              this.rowDataOpen = false;
+              this.fetchPerformance(this.id);
+            });
+          } else {
+            addPerformanceItem(this.rowData).then(response => {
+              this.$modal.msgSuccess("保存成功");
+              this.rowDataOpen = false;
+              this.fetchPerformance(this.id);
+            });
+          }
+        }
+      });
+    },
+    //展开/收起
+    btnUnfold(){
+      this.isUnfold = !this.isUnfold;
+    },
+    //上一个
+    btnPreviou(){
+      let i = this.ids.indexOf(this.id) - 1;
+      if(i > -1){
+        let id = this.ids[i];
+        this.fetchPerformance(id);
+      }else{
+        this.$modal.msgSuccess("已经是当前页第一条了！");
+      }
+    },
+    //下一个
+    btnNext(){
+      let i = this.ids.indexOf(this.id) + 1;
+      if(i < this.ids.length){
+        let id = this.ids[i];
+        this.fetchPerformance(id);
+      }else{
+        this.$modal.msgSuccess("已经是当前页最后一条了！");
+      }
+      
+    },
+    //合计
+    getSummaries(param){
+      const { columns, data } = param;
+      let val = data.reduce((sum, e) => sum + Number(e.weight || 0), 0);
+      this.weightSum = val;
+      return ['合计','','','',val];
+    },
+    //提交
+    btnSubmit(){
+      if(this.weightSum != 100){
+        this.$modal.msgWarning("权重不为100%无法提交！");
+      }
+    },
+    //复制指标
+    btnCopyItem(){
+
+    },
+    //指标修改记录
+    btnLog(){
+
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+.btn_group {
+  z-index: 500;
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  line-height: var(--footer-height);
+  color: #fff;
+}
+</style>

src/views/business/ehr/pm/performance/index.vue

@@ -0,0 +1,183 @@
+<template>
+  <div>
+    <div class="app-container" v-if="isList">
+      <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" label-width="68px">
+        <el-form-item label="员工" prop="staffName">
+          <el-input
+            v-model="queryParams.staffName"
+            clearable
+            @keyup.enter.native="btnSearch"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="btnSearch">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="btnResetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <div style="float:right">
+        <el-button type="primary" size="mini" @click="btnResetQuery">本月绩效</el-button>
+      </div>
+      <el-table size="mini" height="500px" v-loading="loading" :data="listData" @row-dblclick="btnDetails">
+        <el-table-column label="员工姓名" align="center" prop="staffName" />
+        <el-table-column label="评估周期" align="center" prop="name" />
+        <el-table-column label="开始日期" align="center" prop="" />
+        <el-table-column label="结束日期" align="center" prop="" />
+        <el-table-column label="权重" align="center" prop="weight" />
+        <el-table-column label="得分" align="center" prop="mark" />
+        <el-table-column label="等级" align="center" prop="grade" />
+        <el-table-column label="绩效系数" align="center" prop="" />
+        <el-table-column label="状态" align="center" prop="result" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.mk_bo_behavior_res" :value="scope.row.result"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-search"
+              @click="btnDetails(scope.row)"
+            >详情</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="paginationClass">
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </div>
+    </div>
+    <detail v-model="isList" v-if="!isList" :pageStu="page" :rowId="rowId" :ids="ids" @refresh="refresh" />
+  </div>
+</template>
+
+<script>
+import detail from './detail.vue'
+import { listPerformance} from "@/api/business/ehr/pm/performance";
+
+export default {
+  name: "assess",
+  dicts: ['mk_bo_behavior_res','mk_bo_behavior_type','sys_yes_no','mk_bo_behavior_goal','mk_bo_signintype'],
+  components: {detail},
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 表格数据
+      listData: [],
+      // id集合
+      ids: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        staffName: null,
+      },
+      // 查询日期范围
+      dateRange: [],
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+            picker.$emit('pick', [start, end]);
+          }
+        }]
+      },
+      //页面显示
+      isList: true,
+      //页面状态
+      page: '',
+      //详情id
+      rowId: '',
+    };
+  },
+  created() {
+    // this.queryParams.params = {source:"list"};
+    this.getList();
+  },
+  methods: {
+    /** 查询绩效列表 */
+    getList() {
+      this.loading = true;
+      listPerformance(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        this.listData = response.rows;
+        this.ids = response.rows.map(item => item.id);
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    btnSearch() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    btnResetQuery() {
+      this.resetForm("queryForm");
+      this.dateRange = [];
+      this.btnSearch();
+    },
+    /** 刷新 */
+    refresh(){
+      this.resetForm("queryForm");
+      this.dateRange = [];
+      this.getList();
+    },
+    /** 进入详情 */
+    btnDetails(row){
+      this.rowId = row.id;
+      this.page = 'add';
+      this.isList = false;
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.btn_grooup {
+  margin-bottom: 10px;
+  display: flex;
+  justify-content: flex-end;
+}
+.paginationClass {
+  z-index: 500;
+  position: fixed;
+  bottom: 10px;
+  right: 10px;
+  width: 100%;
+  line-height: var(--footer-height);
+  color: #fff;
+}
+</style>

src/views/business/ehr/pm/stagecontrol/detail.vue

@@ -0,0 +1,183 @@
+<template>
+  <div>
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span style="font-weight:bold">阶段控制</span>
+        <div style="float: right; padding: 3px 0" type="text" v-if="pageState == 'see'">
+          <el-button size="mini" plain @click="btnBack">返回</el-button>
+          <el-button size="mini" type="primary" plain @click="btnPublish" v-if="form.stage == '0'">发布</el-button>
+          <el-button size="mini" plain @click="btnPreviou">上一个</el-button>
+          <el-button size="mini" plain @click="btnNext">下一个</el-button>
+        </div>
+      </div>
+      <div v-loading="loading">
+        <el-descriptions :column="4" v-if="pageState == 'see'">
+          <el-descriptions-item label="名称">{{form.name}}</el-descriptions-item>
+          <el-descriptions-item label="月份">{{form.month}}</el-descriptions-item>
+          <el-descriptions-item label="阶段">{{form.stage}}</el-descriptions-item>
+        </el-descriptions>
+        <el-form size="mini" label-position="right" ref="form" :model="form" :rules="formRules" :inline="true" class="demo-form-inline" v-if="pageState != 'see'">
+          <el-row>
+            <el-col span="6">
+              <el-form-item label="名称" prop="name">
+                <el-input v-model="form.name"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col span="6">
+              <el-form-item label="月份" prop="yearMonth">
+                <el-date-picker type="month" v-model="form.month">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div class="foot">
+          <el-button type="primary" size="mini" plain @click="btnEdit" v-if="pageState == 'see'">修改</el-button>
+          <el-button size="mini" plain @click="btnCancel" v-if="pageState != 'see'">取消</el-button>
+          <el-button type="primary" size="mini" plain @click="btnSave" v-if="pageState != 'see'">保存</el-button>
+        </div>
+      </div>
+    </el-card>
+    
+  </div>
+</template>
+
+<script>
+import { getStage,addStage,updateStage,publishStage} from "@/api/business/ehr/pm/stage";
+
+export default {
+  name: 'detail',
+  dicts: ['ehr_pm_aspect',],
+  props: ['enterState','rowId',"ids"],
+  model: {
+    prop: 'isList',
+    event: 'jugislist'
+  },
+  data() {
+    return {
+      //id
+      id:null,
+      //表单
+      form:{},
+      //表单校验规则
+      formRules:{
+        name: [
+          { required: true, message: "名称不能为空", trigger: "blur" },
+        ],
+        month: [
+          { required: true, message: "月份不能为空", trigger: "blur" },
+        ],
+      },
+      //遮罩
+      loading: false,
+      //页面状态
+      pageState: null,
+    }
+  },
+  async created() {
+    this.pageState = this.enterState;
+    if(this.enterState == 'add'){
+      this.form.stage = 0;
+    }
+    if(this.enterState == 'edit' || this.enterState == 'see') {
+      this.id = this.rowId;
+      this.fetchStage(this.id);
+    }
+  },
+  watch: {
+  },
+  methods: {
+    //返回
+    btnBack(){
+      this.$emit('jugislist', true)
+      this.$emit('refresh')
+    },
+    //查询详情
+    async fetchStage(id){
+      this.loading = true;
+      await getStage(id).then(res => {
+        if (res.code === 200) {
+          this.form = res.data;
+          this.id = res.data.id;
+         }
+         this.loading = false;
+      })
+    },
+    //上一个
+    btnPreviou(){
+      let i = this.ids.indexOf(this.id) - 1;
+      if(i > -1){
+        let id = this.ids[i];
+        this.fetchStage(id);
+      }else{
+        this.$modal.msgSuccess("已经是当前页第一条了！");
+      }
+    },
+    //下一个
+    btnNext(){
+      let i = this.ids.indexOf(this.id) + 1;
+      if(i < this.ids.length){
+        let id = this.ids[i];
+        this.fetchStage(id);
+      }else{
+        this.$modal.msgSuccess("已经是当前页最后一条了！");
+      }
+    },
+    //发布
+    btnPublish(){
+      publishStage(this.form).then(response => {
+        this.$modal.msgSuccess("发布成功");
+      });
+      // console.log(111);
+      // this.$modal.confirm('确认要发布吗？').then(function() {
+      //   console.log(222);
+      //   return publishStage(this.form);
+      // }).then(() => {
+      //   this.$modal.msgSuccess("发布成功");
+      // }).catch(() => {});
+    },
+    //修改
+    btnEdit(){
+      this.pageState = "edit";
+    },
+    //取消
+    btnCancel(){
+      if(this.enterState == 'add'){
+        this.btnBack();
+      }else{
+        this.pageState = "see";
+      }
+    },
+    //保存
+    btnSave(){
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != undefined) {
+            updateStage(this.form).then(response => {
+              this.$modal.msgSuccess("保存成功");
+              this.btnBack();
+            });
+          } else {
+            addStage(this.form).then(response => {
+              this.$modal.msgSuccess("保存成功");
+              this.btnBack();
+            });
+          }
+        }
+      });
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.foot {
+  z-index: 500;
+  position: fixed;
+  bottom: 10px;
+  right: 10px;
+  width: 100%;
+  line-height: var(--footer-height);
+  text-align: right;
+}
+</style>

src/views/business/ehr/pm/stagecontrol/index.vue

@@ -0,0 +1,196 @@
+<template>
+  <div>
+    <div class="app-container" v-if="isList">
+      <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" label-width="68px">
+        <el-form-item label="名称" prop="name">
+          <el-input
+            v-model="queryParams.name"
+            clearable
+            @keyup.enter.native="btnSearch"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="btnSearch">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="btnResetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <div style="float:right">
+        <el-button type="primary" size="mini" @click="btnAdd">新增</el-button>
+      </div>
+      <el-table size="mini" v-loading="loading" :data="listData" height="500px" @row-dblclick="btnDetails">
+        <el-table-column label="编号" align="center" prop="id" />
+        <el-table-column label="名称" align="center" prop="name" />
+        <el-table-column label="阶段" align="center" prop="stage" />
+        <el-table-column label="创建时间" align="center" prop="createTime" />
+        <el-table-column label="创建人" align="center" prop="createBy" />
+        <!-- <el-table-column label="阶段" align="center" prop="result" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.mk_bo_behavior_res" :value="scope.row.result"/>
+          </template>
+        </el-table-column> -->
+        <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              @click="btnDetails(scope.row)"
+            >详情</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              @click="btnDelete(scope.row)"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="paginationClass">
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </div>
+    </div>
+    <detail v-model="isList" v-if="!isList" :enterState="enterState" :rowId="rowId" :ids="ids" @refresh="refresh" />
+  </div>
+</template>
+
+<script>
+import detail from './detail.vue'
+import { listStage,delStage} from "@/api/business/ehr/pm/stage";
+
+export default {
+  name: "assess",
+  dicts: [],
+  components: {detail},
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 总条数
+      total: 0,
+      // 表格数据
+      listData: [],
+      // id集合
+      ids: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+      },
+      // 查询日期范围
+      dateRange: [],
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+            picker.$emit('pick', [start, end]);
+          }
+        }]
+      },
+      //页面显示
+      isList: true,
+      //进入详情页面状态
+      enterState: '',
+      //详情id
+      rowId: '',
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询行动列表 */
+    getList() {
+      this.loading = true;
+      listStage(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        this.listData = response.rows;
+        this.ids = response.rows.map(item => item.id);
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    btnSearch() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    btnResetQuery() {
+      this.resetForm("queryForm");
+      this.dateRange = [];
+      this.btnSearch();
+    },
+    /** 刷新 */
+    refresh(){
+      this.resetForm("queryForm");
+      this.dateRange = [];
+      this.getList();
+    },
+    /** 进入详情 */
+    btnDetails(row){
+      this.rowId = row.id;
+      this.enterState = 'see';
+      this.isList = false;
+    },
+    /** 删除 */
+    btnDelete(row){
+      this.$modal.confirm('是否确认删除编号为"' + row.id + '"的数据项？这将会同时删除关联绩效').then(function() {
+        return delStage(row.id);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    //新增
+    btnAdd(){
+      this.rowId = null;
+      this.enterState = 'add';
+      this.isList = false;
+    },
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.btn_grooup {
+  margin-bottom: 10px;
+  display: flex;
+  justify-content: flex-end;
+}
+.paginationClass {
+  z-index: 500;
+  position: fixed;
+  bottom: 10px;
+  right: 10px;
+  width: 100%;
+  line-height: var(--footer-height);
+  color: #fff;
+}
+</style>

src/views/business/spd/bo/plan/add.vue

@@ -54,8 +54,8 @@
             <el-form-item label="开始时间" prop="startDate"
               :rules="{ required: true, message: '请选择开始时间', trigger: 'blur' }">
               <el-date-picker v-model="basicForm.startDate" :disabled="sonDisable" clearable type="date"
-                value-format="yyyy-MM-dd 00:00:00" :picker-options="pickerOptionsStart" size="mini" style="width: 200px"
-                placeholder="选择开始时间">
+                @change="setDateRange(basicForm.startDate)" value-format="yyyy-MM-dd 00:00:00"
+                :picker-options="pickerOptionsStart" size="mini" style="width: 200px" placeholder="选择开始时间">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -697,6 +697,46 @@
           h('span', ' ' + column.label)
         ];
       },
+      //改变开始时间时其它时间字段随之改变
+      setDateRange(startDate) {
+        console.log(startDate);
+        let newDate = new Date(startDate);
+        newDate.setDate(newDate.getDate() + this.basicForm.mkBoPlanItemList.length - 1);
+        this.basicForm.deadlineTime = this.formatDateTime(newDate, 'yyyy-MM-dd 00:00:00');
+        console.log(startDate);
+        let newDateGoal = new Date(startDate);
+        for (let i = 0; i < this.basicForm.mkBoPlanItemList.length; i++) {
+          this.basicForm.mkBoPlanItemList[i].date = this.formatDateTime(newDateGoal, 'yyyy-MM-dd 00:00:00');
+          newDateGoal.setDate(newDateGoal.getDate() + 1);
+        }
+      },
+      //日期名称格式化
+      formatDateTime(date, format) {
+        const o = {
+          'M+': date.getMonth() + 1, // 月份
+          'd+': date.getDate(), // 日
+          'h+': date.getHours() % 12 === 0 ? 12 : date.getHours() % 12, // 小时
+          'H+': date.getHours(), // 小时
+          'm+': date.getMinutes(), // 分
+          's+': date.getSeconds(), // 秒
+          'q+': Math.floor((date.getMonth() + 3) / 3), // 季度
+          S: date.getMilliseconds(), // 毫秒
+          a: date.getHours() < 12 ? '上午' : '下午', // 上午/下午
+          A: date.getHours() < 12 ? 'AM' : 'PM', // AM/PM
+        };
+        if (/(y+)/.test(format)) {
+          format = format.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
+        }
+        for (let k in o) {
+          if (new RegExp('(' + k + ')').test(format)) {
+            format = format.replace(
+              RegExp.$1,
+              RegExp.$1.length === 1 ? o[k] : ('00' + o[k]).substr(('' + o[k]).length)
+            );
+          }
+        }
+        return format;
+      },
     }
   }
 

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

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" label-width="100px">
       <el-row :gutter="20">
         <el-col :span="6">
           <el-form-item label="编码" prop="code">
@@ -34,7 +34,7 @@
       </el-row>
 
     </el-form>
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" v-show="showSearch" label-width="100px">
       <el-row :gutter="20">
         <el-col :span="6">
           <el-form-item label="年度" prop="annual">
@@ -107,7 +107,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="annualSaleGoalList" @selection-change="handleSelectionChange"
-      @row-dblclick="useDoubleClick" v-horizontal-scroll>
+      @row-dblclick="useDoubleClick" v-horizontal-scroll max-height="560">
       <el-table-column label="编码" align="center" prop="code" width="180" />
       <el-table-column label="目标名称" align="center" prop="goalName" width="240" />
       <el-table-column label="单据日期" align="center" prop="documentDate" width="180">
@@ -137,9 +137,12 @@
           <el-button v-if="scope.row.status == '0' || scope.row.status == '3'" size="mini" type="text"
             @click="handleDelete(scope.row)">删除
           </el-button>
-          <el-button v-if="scope.row.status == '0' || scope.row.status == '3'" size="mini" type="text"
+          <el-button v-if="scope.row.status == '0' && (scope.row.flowId == null || scope.row.flowId == '')" size="mini" type="text"
             @click="handleSubmit(scope.row)">提交
           </el-button>
+          <el-button v-if="(scope.row.status == '0' || scope.row.status == '3') && !(scope.row.flowId == null || scope.row.flowId == '')" size="mini" type="text"
+            @click="handleResubmit(scope.row)">重新提交
+          </el-button>
           <el-button v-if="scope.row.status == '1'" size="mini" type="text" @click="handleReback(scope.row)">收回
           </el-button>
         </template>
@@ -151,7 +154,7 @@
 
     <el-drawer :title="title" :visible.sync="open" direction="rtl" :before-close="handleClose" size="100%"
       v-horizontal-scroll disabled>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px" :disabled="openStatus == 'see'">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px" :disabled="openStatus == 'see'" size="mini">
         <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="编码" prop="code">
@@ -207,7 +210,7 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="目标合计（元）" prop="goalTotal">
+            <el-form-item label="目标合计（元）" prop="goalTotal" label-width="120px">
               <el-input v-model="form.goalTotal" placeholder="目标合计自动计算" clearable disabled />
             </el-form-item>
           </el-col>
@@ -227,7 +230,7 @@
         </el-row>
 
         <div id="addDetails">
-          <el-row :gutter="10" class="mb8" style="margin-left: 80%">
+          <el-row :gutter="10" class="mb8" style="margin-left: 75%">
             <el-col :span="1.5">
               <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleTemplateDownload">模板下载
               </el-button>
@@ -247,7 +250,8 @@
           </el-row>
           <el-tabs v-model="activeName">
             <el-tab-pane label="年销售目标填报明细" name="annualSaleGoalDetails">
-              <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading"
+
+              <el-table max-height="560" show-summary :summary-method="getSummaries" v-loading="loading"
                 :data="annualSaleGoalDetailsList" @selection-change="handleSelectionChange" v-horizontal-scroll>
                 <el-table-column label="序号" type="index" width="70" align="center" fixed />
                 <el-table-column label="销售组织" align="center" width="180"
@@ -287,22 +291,19 @@
                     </el-popover-select-v2>
                   </template>
                 </el-table-column>
-                <el-table-column label="一级分类" align="center" width="180"
-                  :render-header="(h, obj) => addRedStar(h, obj, '0')">
+                <el-table-column label="一级分类" align="center" width="180">
                   <template slot-scope="scope">
                     <el-input v-model="annualSaleGoalDetailsList[scope.$index].oneLevelClassify" placeholder="请输入一级分类"
                       disabled></el-input>
                   </template>
                 </el-table-column>
-                <el-table-column label="二级分类" align="center" width="180"
-                  :render-header="(h, obj) => addRedStar(h, obj, '0')">
+                <el-table-column label="二级分类" align="center" width="180">
                   <template slot-scope="scope">
                     <el-input v-model="annualSaleGoalDetailsList[scope.$index].twoLevelClassify" placeholder="请输入二级分类"
                       disabled></el-input>
                   </template>
                 </el-table-column>
-                <el-table-column label="物料" align="center" width="220"
-                  :render-header="(h, obj) => addRedStar(h, obj, '0')">
+                <el-table-column label="物料" align="center" width="220">
                   <template slot-scope="scope">
                     <el-popover-select-v2 v-model="annualSaleGoalDetailsList[scope.$index].material" title="物料"
                       valueKey="name" referName="MATERIAL_PARAM"
@@ -427,6 +428,186 @@
                   </template>
                 </el-table-column>
               </el-table>
+
+              <!-- <ux-grid max-height="560" show-summary :summary-method="getSummaries" v-loading="loading"
+                :data="annualSaleGoalDetailsList" @selection-change="handleSelectionChange" v-horizontal-scroll>
+                <ux-table-column title="序号" type="index" width="70" align="center" fixed />
+                <ux-table-column title="销售组织" align="center" width="180"
+                  :render-header="(h, obj) => addRedStar(h, obj, '0')">
+                  <template slot-scope="scope">
+                    <el-popover-select-v2 v-model="annualSaleGoalDetailsList[scope.$index].saleOrg" title="销售组织"
+                      valueKey="name" referName="ORG_PARAM" :dataMapping="{ saleOrgCode: 'code', saleOrg: 'name'}"
+                      :source.sync="annualSaleGoalDetailsList[scope.$index]" placeholder="请输入销售组织">
+                    </el-popover-select-v2>
+                  </template>
+                </ux-table-column>
+                <ux-table-column title="销售区域" align="center" width="180"
+                  :render-header="(h, obj) => addRedStar(h, obj, '0')">
+                  <template slot-scope="scope">
+                    <el-popover-select-v2 v-model="annualSaleGoalDetailsList[scope.$index].saleZone" title="销售区域"
+                      valueKey="name" referName="MK_SALESAREA_PARAM"
+                      :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
+                      :source.sync="annualSaleGoalDetailsList[scope.$index]" placeholder="请输入销售区域">
+                    </el-popover-select-v2>
+                  </template>
+                </ux-table-column>
+                <ux-table-column title="客户" align="center" width="180"
+                  :render-header="(h, obj) => addRedStar(h, obj, '0')">
+                  <template slot-scope="scope">
+                    <el-popover-select-v2 v-model="annualSaleGoalDetailsList[scope.$index].custom" title="客户"
+                      valueKey="name" referName="CUSTOMER_PARAM" :dataMapping="{ customCode: 'code', custom: 'name'}"
+                      :source.sync="annualSaleGoalDetailsList[scope.$index]" placeholder="请输入客户">
+                    </el-popover-select-v2>
+                  </template>
+                </ux-table-column>
+                <ux-table-column title="负责人" align="center" width="180"
+                  :render-header="(h, obj) => addRedStar(h, obj, '0')">
+                  <template slot-scope="scope">
+                    <el-popover-select-v2 v-model="annualSaleGoalDetailsList[scope.$index].creator" title="负责人"
+                      valueKey="name" referName="CONTACTS_PARAM" :dataMapping="{ creatorCode: 'code', creator: 'name'}"
+                      :source.sync="annualSaleGoalDetailsList[scope.$index]" placeholder="请输入负责人">
+                    </el-popover-select-v2>
+                  </template>
+                </ux-table-column>
+                <ux-table-column title="一级分类" align="center" width="180">
+                  <template slot-scope="scope">
+                    <el-input v-model="annualSaleGoalDetailsList[scope.$index].oneLevelClassify" placeholder="请输入一级分类"
+                      disabled></el-input>
+                  </template>
+                </ux-table-column>
+                <ux-table-column title="二级分类" align="center" width="180">
+                  <template slot-scope="scope">
+                    <el-input v-model="annualSaleGoalDetailsList[scope.$index].twoLevelClassify" placeholder="请输入二级分类"
+                      disabled></el-input>
+                  </template>
+                </ux-table-column>
+                <ux-table-column title="物料" align="center" width="220">
+                  <template slot-scope="scope">
+                    <el-popover-select-v2 v-model="annualSaleGoalDetailsList[scope.$index].material" title="物料"
+                      valueKey="name" referName="MATERIAL_PARAM"
+                      @change="setClassify(scope.row.oneLevelClassify, scope.row.twoLevelClassify, annualSaleGoalDetailsList[scope.$index])"
+                      @clear=""
+                      :dataMapping="{ materialCode: 'code', material: 'name', oneLevelClassify: 'oneClass', twoLevelClassify: 'twoClass'}"
+                      :source.sync="annualSaleGoalDetailsList[scope.$index]" placeholder="请输入物料">
+                    </el-popover-select-v2>
+                  </template>
+                </ux-table-column>
+                <ux-table-column title="合计（元）" align="center" field="totalGoal" width="180">
+                  <template slot-scope="scope">
+                    <el-input v-model="annualSaleGoalDetailsList[scope.$index].totalGoal" disabled></el-input>
+                  </template>
+                </ux-table-column>
+                <ux-table-column title="一月（元）" align="center" field="januaryGoal" width="220">
+                  <template slot-scope="scope">
+                    <el-input-number
+                      @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])"
+                      v-model="annualSaleGoalDetailsList[scope.$index].januaryGoal" :precision="2" :step="0.1" :min="0">
+                    </el-input-number>
+                  </template>
+                </ux-table-column>
+                <ux-table-column title="二月（元）" align="center" field="februaryGoal" width="220">
+                  <template slot-scope="scope">
+                    <el-input-number
+                      @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])"
+                      v-model="annualSaleGoalDetailsList[scope.$index].februaryGoal" :precision="2" :step="0.1"
+                      :min="0">
+                    </el-input-number>
+                  </template>
+                </ux-table-column>
+                <ux-table-column title="三月（元）" align="center" field="marchGoal" width="220">
+                  <template slot-scope="scope">
+                    <el-input-number
+                      @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])"
+                      v-model="annualSaleGoalDetailsList[scope.$index].marchGoal" :precision="2" :step="0.1" :min="0">
+                    </el-input-number>
+                  </template>
+                </ux-table-column>
+                <ux-table-column title="四月（元）" align="center" field="aprilGoal" width="220">
+                  <template slot-scope="scope">
+                    <el-input-number
+                      @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])"
+                      v-model="annualSaleGoalDetailsList[scope.$index].aprilGoal" :precision="2" :step="0.1" :min="0">
+                    </el-input-number>
+                  </template>
+                </ux-table-column>
+                <ux-table-column title="五月（元）" align="center" field="mayGoal" width="220">
+                  <template slot-scope="scope">
+                    <el-input-number
+                      @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])"
+                      v-model="annualSaleGoalDetailsList[scope.$index].mayGoal" :precision="2" :step="0.1" :min="0">
+                    </el-input-number>
+                  </template>
+                </ux-table-column>
+                <ux-table-column title="六月（元）" align="center" field="juneGoal" width="220">
+                  <template slot-scope="scope">
+                    <el-input-number
+                      @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])"
+                      v-model="annualSaleGoalDetailsList[scope.$index].juneGoal" :precision="2" :step="0.1" :min="0">
+                    </el-input-number>
+                  </template>
+                </ux-table-column>
+                <ux-table-column title="七月（元）" align="center" field="julyGoal" width="220">
+                  <template slot-scope="scope">
+                    <el-input-number
+                      @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])"
+                      v-model="annualSaleGoalDetailsList[scope.$index].julyGoal" :precision="2" :step="0.1" :min="0">
+                    </el-input-number>
+                  </template>
+                </ux-table-column>
+                <ux-table-column title="八月（元）" align="center" field="augustGoal" width="220">
+                  <template slot-scope="scope">
+                    <el-input-number
+                      @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])"
+                      v-model="annualSaleGoalDetailsList[scope.$index].augustGoal" :precision="2" :step="0.1" :min="0">
+                    </el-input-number>
+                  </template>
+                </ux-table-column>
+                <ux-table-column title="九月（元）" align="center" field="septemberGoal" width="220">
+                  <template slot-scope="scope">
+                    <el-input-number
+                      @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])"
+                      v-model="annualSaleGoalDetailsList[scope.$index].septemberGoal" :precision="2" :step="0.1"
+                      :min="0">
+                    </el-input-number>
+                  </template>
+                </ux-table-column>
+                <ux-table-column title="十月（元）" align="center" field="octoberGoal" width="220">
+                  <template slot-scope="scope">
+                    <el-input-number
+                      @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])"
+                      v-model="annualSaleGoalDetailsList[scope.$index].octoberGoal" :precision="2" :step="0.1" :min="0">
+                    </el-input-number>
+                  </template>
+                </ux-table-column>
+                <ux-table-column title="十一月（元）" align="center" field="novemberGoal" width="220">
+                  <template slot-scope="scope">
+                    <el-input-number
+                      @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])"
+                      v-model="annualSaleGoalDetailsList[scope.$index].novemberGoal" :precision="2" :step="0.1"
+                      :min="0">
+                    </el-input-number>
+                  </template>
+                </ux-table-column>
+                <ux-table-column title="十二月（元）" align="center" field="decemberGoal" width="220">
+                  <template slot-scope="scope">
+                    <el-input-number
+                      @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])"
+                      v-model="annualSaleGoalDetailsList[scope.$index].decemberGoal" :precision="2" :step="0.1"
+                      :min="0">
+                    </el-input-number>
+                  </template>
+                </ux-table-column>
+                <ux-table-column title="操作" align="center" class-name="small-padding fixed-width" width="120px"
+                  fixed="right">
+                  <template slot-scope="scope">
+                    <el-button size="mini" type="text" icon="el-icon-delete"
+                      @click="handleDeleteDetails(scope.$index, scope.row)">删除</el-button>
+                    <el-button size="mini" type="text" icon="el-icon-delete" @click="handleCopyDetails(scope.row)">复制
+                    </el-button>
+                  </template>
+                </ux-table-column>
+              </ux-grid> -->
+
             </el-tab-pane>
           </el-tabs>
           <div slot="footer" class="dialog-footer" style="margin-left: 88%; margin-top: 1%">
@@ -481,6 +662,7 @@
     addAnnualSaleGoal,
     updateAnnualSaleGoal,
     submit,
+    resubmit,
   } from "@/api/business/spd/goal_management/annualSaleGoal";
   import {
     delAnnualSaleGoalDetails,
@@ -889,11 +1071,23 @@
         }
         for (let i = 0; i < this.annualSaleGoalDetailsList.length; i++) {
           for (let j = i + 1; j < this.annualSaleGoalDetailsList.length; j++) {
-            if (this.annualSaleGoalDetailsList[i].materialCode == this.annualSaleGoalDetailsList[j].materialCode) {
+            if (this.annualSaleGoalDetailsList[i].materialCode == this.annualSaleGoalDetailsList[j].materialCode &&
+              this.annualSaleGoalDetailsList[i].materialCode != null && 
+              this.annualSaleGoalDetailsList[j].materialCode != null && 
+              this.annualSaleGoalDetailsList[i].materialCode != "" && 
+              this.annualSaleGoalDetailsList[j].materialCode != "") {
               return this.$message.error('子表存在重复物料');
             }
           }
         }
+        this.annualSaleGoalDetailsList.forEach(item => {
+          if (item.oneLevelClassify == null || item.oneLevelClassify == "") {
+            item.oneLevelClassifyCode = null;
+          }
+          if (item.twoLevelClassify == null || item.twoLevelClassify == "") {
+            item.twoLevelClassifyCode = null;
+          }
+        })
         this.$refs["form"].validate(valid => {
           if (valid) {
             if (this.form.id != null) {
@@ -1044,11 +1238,9 @@
         const arr = JSON.parse(JSON.stringify(this.annualSaleGoalDetailsList))
         for (const element of arr) {
           const flag1 = (element.saleZone !== null) && (element.saleOrg !== null) && (element.custom !== null) && (
-            element.creator !== null) && (element.materialCode !== null) && (element.material !== null) &&
-            (element.goalValue !== 0)
+            element.creator !== null) && (element.goalValue !== 0)
           const flag2 = (element.saleOrg !== undefined) && (element.saleZone !== undefined) && (element.custom !==
-            undefined) && (element.creator !== undefined) && (element.materialCode != undefined) && (element
-            .material !== undefined)
+            undefined) && (element.creator !== undefined)
           if (flag1 && flag2) {
             isFlag.push(true);
           } else {
@@ -1079,7 +1271,7 @@
         obj.oneLevelClassify = oneArray[0]
         obj.twoLevelClassifyCode = twoArray[1]
         obj.twoLevelClassify = twoArray[0]
-        console.log(obj);
+        console.log(obj, 'obj');
       },
       // 批量修改对话框的方法
       dialogUpdateMoreSave() {
@@ -1133,6 +1325,25 @@
           this.$modal.closeLoading();
         }
       },
+      //重新提交
+      async handleResubmit(row) {
+        this.$modal.loading("提交中...");
+        try {
+          const {
+            msg,
+            code
+          } = await resubmit(row.id);
+          if (code === 200) {
+            this.$modal.notifySuccess("提交成功");
+            this.$modal.closeLoading();
+            row.status = '1'
+            // this.getList(this.queryParams)
+          }
+        } catch (err) {
+          console.error(err);
+          this.$modal.closeLoading();
+        }
+      },      
       //收回
       handleReback(row) {
         this.$modal.loading("收回中...");

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

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" label-width="100px">
       <el-row :gutter="20">
         <el-col :span="6">
           <el-form-item label="编码" prop="code">
@@ -33,7 +33,7 @@
         </el-col>
       </el-row>
     </el-form>
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" v-show="showSearch" label-width="100px">
       <el-row :gutter="20">
         <el-col :span="6">
           <el-form-item label="年度" prop="annual">
@@ -125,7 +125,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="annualSaleGoalMergeList" @selection-change="handleSelectionChange"
-      @row-dblclick="useDoubleClick" v-horizontal-scroll>
+      @row-dblclick="useDoubleClick" v-horizontal-scroll max-height="560">
       <el-table-column label="编码" align="center" prop="code" width="180" />
       <el-table-column label="目标名称" align="center" prop="goalName" width="240" />
       <el-table-column label="单据日期" align="center" prop="documentDate" width="180">
@@ -171,7 +171,7 @@
     <!-- 添加或修改年度销售目标明细对话框 -->
     <el-drawer :title="title" :visible.sync="open" direction="rtl" :before-close="handleClose" size="100%"
       v-horizontal-scroll>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px" :disabled="openStatus == 'see'">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px" :disabled="openStatus == 'see'" size="mini">
         <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="编码" prop="code">
@@ -220,7 +220,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="目标值汇总（元）" prop="goalTotal">
+            <el-form-item label="目标合计（元）" prop="goalTotal" label-width="120px">
               <el-input v-model="form.goalTotal" placeholder="目标值汇总自动计算" disabled />
             </el-form-item>
           </el-col>
@@ -268,7 +268,7 @@
           </el-row>
           <el-tabs v-model="activeName" @tab-click="getNewTwoArray">
             <el-tab-pane label="年销售目标合并明细" name="annualSaleGoalMergeDetails">
-              <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading"
+              <el-table max-height="560" show-summary :summary-method="getSummaries" v-loading="loading"
                 :data="annualSaleGoalMergeDetailsList" v-horizontal-scroll>
                 <el-table-column label="序号" type="index" width="70" align="center" fixed />
                 <el-table-column label="销售组织" align="center" width="180">

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

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" label-width="100px">
       <el-row :gutter="20">
         <el-col :span="6">
           <el-form-item label="编码" prop="code">
@@ -33,7 +33,7 @@
         </el-col>
       </el-row>
     </el-form>
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" v-show="showSearch" label-width="100px">
       <el-row :gutter="20">
         <el-col :span="6">
           <el-form-item label="年度" prop="annual">
@@ -129,7 +129,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="monthGoalMergeList" @selection-change="handleSelectionChange"
-      @row-dblclick="useDoubleClick" v-horizontal-scroll>
+      @row-dblclick="useDoubleClick" v-horizontal-scroll max-height="560">
       <el-table-column label="编码" align="center" prop="code" width="180" />
       <el-table-column label="目标名称" align="center" prop="goalName" width="240" />
       <el-table-column label="单据日期" align="center" prop="documentDate" width="180">
@@ -173,7 +173,7 @@
     <!-- 添加或修改月销售目标合并抽屉 -->
     <el-drawer :title="title" :visible.sync="open" direction="rtl" :before-close="handleClose" size="100%"
       v-horizontal-scroll>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px" :disabled="openStatus == 'see'">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px" :disabled="openStatus == 'see'" size="mini">
         <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="编码" prop="code">
@@ -232,8 +232,8 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="目标值合计（元）" prop="goalSum">
-              <el-input v-model="form.goalSum" placeholder="目标值合计自动计算" disabled />
+            <el-form-item label="目标合计（元）" prop="goalSum" label-width="120px">
+              <el-input v-model="form.goalSum" placeholder="目标值合计自动计算" disabled/>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -278,7 +278,7 @@
           </el-row>
           <el-tabs v-model="activeName" @tab-click="getNewTwoArray">
             <el-tab-pane label="月销售目标合并明细" name="monthGoalMergeDetails">
-              <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading"
+              <el-table max-height="560" show-summary :summary-method="getSummaries" v-loading="loading"
                 :data="monthGoalMergeDetailsList" @selection-change="handleSelectionChange" v-horizontal-scroll>
                 <el-table-column label="序号" type="index" width="70" align="center" fixed />
                 <el-table-column label="销售组织" align="center" prop="saleOrg" width="180">
@@ -325,7 +325,7 @@
                     </el-popover-select-v2>
                   </template>
                 </el-table-column>
-                <el-table-column label="科室" align="center" prop="department" width="180">
+                <el-table-column label="科室" align="center" width="180">
                   <template slot-scope="scope">
                     <el-input v-model="monthGoalMergeDetailsList[scope.$index].department" placeholder="请输入科室" disabled>
                     </el-input>

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

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" label-width="100px">
       <el-row :gutter="20">
         <el-col :span="6">
           <el-form-item label="编码" prop="code">
@@ -33,7 +33,7 @@
         </el-col>
       </el-row>
     </el-form>
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" v-show="showSearch" label-width="100px">
       <el-row :gutter="20">
         <el-col :span="6">
           <el-form-item label="年度" prop="annual">
@@ -104,7 +104,7 @@
       </el-col>
     </el-row>
     <el-table v-loading="loading" :data="monthReturnGoalList" @selection-change="handleSelectionChange"
-      @row-dblclick="useDoubleClick" v-horizontal-scroll>
+      @row-dblclick="useDoubleClick" v-horizontal-scroll max-height="560">
       <el-table-column label="编码" align="center" prop="code" width="180" />
       <el-table-column label="目标名称" align="center" prop="goalName" width="240" />
       <el-table-column label="单据日期" align="center" prop="documentDate" width="180">
@@ -146,7 +146,7 @@
 
     <el-drawer :title="title" :visible.sync="open" direction="rtl" :before-close="handleClose" size="100%"
       v-horizontal-scroll>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px" :disabled="openStatus == 'see'">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px" :disabled="openStatus == 'see'" size="mini">
         <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="编码" prop="code">
@@ -204,7 +204,7 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="目标合计（元）" prop="goalSum">
+            <el-form-item label="目标合计（元）" prop="goalSum" label-width="120px">
               <el-input v-model="form.goalSum" placeholder="目标合计自动计算" disabled />
             </el-form-item>
           </el-col>
@@ -223,7 +223,7 @@
           </el-col>
         </el-row>
         <div>
-          <el-row :gutter="10" class="mb8" style="margin-left: 80%">
+          <el-row :gutter="10" class="mb8" style="margin-left: 75%">
             <el-col :span="1.5">
               <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleTemplateDownload">模板下载
               </el-button>
@@ -243,7 +243,7 @@
           </el-row>
           <el-tabs v-model="activeName">
             <el-tab-pane label="月回款目标明细" name="monthReturnGoalDetails">
-              <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading"
+              <el-table max-height="560" show-summary :summary-method="getSummaries" v-loading="loading"
                 :data="monthReturnGoalDetailsList" @selection-change="handleSelectionChange" v-horizontal-scroll>
                 <el-table-column label="序号" type="index" width="70" align="center" fixed />
                 <el-table-column label="销售组织" align="center" width="180" :render-header="addRedStar">

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

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" label-width="100px">
       <el-row :gutter="20">
         <el-col :span="6">
           <el-form-item label="编码" prop="code">
@@ -33,7 +33,7 @@
         </el-col>
       </el-row>
     </el-form>
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" v-show="showSearch" label-width="100px">
       <el-row :gutter="20">
         <el-col :span="6">
           <el-form-item label="年度" prop="annual">
@@ -109,7 +109,7 @@
       </el-col>
     </el-row>
     <el-table v-loading="loading" :data="monthReturnMergeList" @selection-change="handleSelectionChange"
-      @row-dblclick="useDoubleClick" v-horizontal-scroll>
+      @row-dblclick="useDoubleClick" v-horizontal-scroll max-height="560">
       <el-table-column label="编码" align="center" prop="code" width="180" />
       <el-table-column label="目标名称" align="center" prop="goalName" width="240" />
       <el-table-column label="单据日期" align="center" prop="documentDate" width="180">
@@ -124,7 +124,7 @@
       <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="goalSum" width="180" />
+      <el-table-column label="目标合计（元）" align="center" prop="goalSum" width="180" />
       <el-table-column show-overflow-tooltip label="状态" align="center" width="100" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_status" :value="scope.row.status" />
@@ -153,7 +153,7 @@
     <!-- 添加或修改月销售目标合并抽屉 -->
     <el-drawer :title="title" :visible.sync="open" direction="rtl" :before-close="handleClose" size="100%"
       v-horizontal-scroll>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px" :disabled="openStatus == 'see'">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px" :disabled="openStatus == 'see'" size="mini">
         <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="编码" prop="code">
@@ -223,12 +223,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="目标值合计（元）" prop="goalSum">
+            <el-form-item label="目标合计（元）" prop="goalSum" label-width="120px">
               <el-input v-model="form.goalSum" placeholder="目标值合计自动计算" disabled />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="单据状态" prop="type">
               <el-select v-model="form.status" placeholder="" disabled>
@@ -310,7 +308,7 @@
               </el-table>
             </el-tab-pane>
             <el-tab-pane label="区域目标汇总(月回款)" name="zoneGoalSum(monthReturn)">
-              <el-table max-height="300" show-summary :summary-method="getSummaries" :data="zoneGoalSumList"
+              <el-table max-height="560" show-summary :summary-method="getSummaries" :data="zoneGoalSumList"
                 v-horizontal-scroll>
                 <el-table-column label="序号" type="index" width="55" align="center" fixed />
                 <el-table-column label="销售组织" align="center" width="180">

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

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" label-width="100px">
       <el-row :gutter="20">
         <el-col :span="6">
           <el-form-item label="编码" prop="code">
@@ -33,7 +33,7 @@
         </el-col>
       </el-row>
     </el-form>
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" v-show="showSearch" label-width="100px">
       <el-row :gutter="20">
         <el-col :span="6">
           <el-form-item label="年度" prop="annual">
@@ -106,7 +106,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="monthSaleGoalList" @selection-change="handleSelectionChange"
-      @row-dblclick="useDoubleClick" v-horizontal-scroll>
+      @row-dblclick="useDoubleClick" v-horizontal-scroll max-height="560">
       <el-table-column label="编码" align="center" prop="code" width="180" />
       <el-table-column label="目标名称" align="center" prop="goalName" width="240" />
       <el-table-column label="单据日期" align="center" prop="documentDate" width="180">
@@ -149,7 +149,7 @@
 
     <el-drawer :title="title" :visible.sync="open" direction="rtl" :before-close="handleClose" size="100%"
       v-horizontal-scroll>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px" :disabled="openStatus == 'see'">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px" :disabled="openStatus == 'see'" size="mini">
         <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="编码" prop="code">
@@ -207,7 +207,7 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="目标合计（元）" prop="goalSum">
+            <el-form-item label="目标合计（元）" prop="goalSum" label-width="120px">
               <el-input v-model="form.goalSum" placeholder="目标合计自动计算" disabled />
             </el-form-item>
           </el-col>
@@ -226,7 +226,7 @@
           </el-col>
         </el-row>
         <div>
-          <el-row :gutter="10" class="mb8" style="margin-left: 80%">
+          <el-row :gutter="10" class="mb8" style="margin-left: 75%">
             <el-col :span="1.5">
               <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleTemplateDownload">模板下载
               </el-button>
@@ -246,7 +246,7 @@
           </el-row>
           <el-tabs v-model="activeName">
             <el-tab-pane label="月销售目标明细" name="monthSaleGoalDetails">
-              <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading"
+              <el-table max-height="560" show-summary :summary-method="getSummaries" v-loading="loading"
                 :data="monthSaleGoalDetailsList" @selection-change="handleSelectionChange" v-horizontal-scroll>
                 <el-table-column label="序号" type="index" width="70" align="center" fixed />
                 <el-table-column label="销售组织" align="center" width="180" :render-header="addRedStar">

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

@@ -325,6 +325,9 @@
         listTarget(this.addDateRange(params, this.dateRange)).then(res => {
           if (res.code === 200) {
             this.tableList = res.rows;
+            for (const item of this.tableList) {
+              item.templateData.year = item.templateData.year.substr(0, 4);
+            }
             this.total = res.total;
             this.loading = false;
           }

src/views/business/spd/target/targetTemplate/detail.vue

@@ -127,12 +127,12 @@
                     <el-tab-pane label="周期" name="cycles">
                         <el-table :data="form.cycles" height="600px" size="size" v-horizontal-scroll>
                             <el-table-column label="序号" type="index" width="50" align="center" fixed/>
-                            <el-table-column show-overflow-tooltip label="周期" align="center" width="200" prop="name">
+                            <el-table-column show-overflow-tooltip label="周期" align="center" width="250" prop="name">
                                 <template slot-scope="scope">
                                     <el-input
                                         size="mini"
                                         v-model="scope.row.name"
-                                        style="width: 150px"
+                                        style="width: 200px"
                                         clearable
                                     />
                                 </template>
@@ -415,7 +415,7 @@ export default {
       deadline.setHours( 0, 0, 0);
       if(this.form.cycle == 'period'){
         cycles.push({
-          name:'目标期间',
+          name:this.formatDateTime(start, 'yyyy-MM-dd') + '到' + this.formatDateTime(deadline, 'yyyy-MM-dd'),
           startTime:this.formatDateTime(start, 'yyyy-MM-dd'),
           deadlineTime:this.formatDateTime(deadline, 'yyyy-MM-dd'),
         });
@@ -432,10 +432,11 @@ export default {
           }
           if(this.form.cycle == 'week'){
             var cy = {};
-            cy.name = this.formatDateTime(start, 'yyyy-MM-dd');
+            let date = this.formatDateTime(start, 'yyyy-MM-dd');
             cy.startTime = this.formatDateTime(start, 'yyyy-MM-dd');
             start.setDate(start.getDate()+6);
             cy.deadlineTime = this.formatDateTime(start, 'yyyy-MM-dd');
+            cy.name = date + '到' + this.formatDateTime(start, 'yyyy-MM-dd');
             cycles.push(cy);
             start.setDate(start.getDate()+1);
           }
@@ -452,10 +453,11 @@ export default {
           }
           if(this.form.cycle == 'season'){
             var cy = {};
-            cy.name = this.formatDateTime(start, 'yyyy-MM');
+            let date = this.formatDateTime(start, 'yyyy-MM');
             cy.startTime = this.formatDateTime(start, 'yyyy-MM-dd');
             start.setDate(start.getDate()+90);
             cy.deadlineTime = this.formatDateTime(start, 'yyyy-MM-dd');
+            cy.name = date + '到' + this.formatDateTime(start, 'yyyy-MM');
             cycles.push(cy);
             start.setDate(start.getDate()+1);
           }

src/views/material/requisition/add.vue

@@ -292,7 +292,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="税类编码" prop="rateCode">
+                <el-form-item label="物料税类编码" prop="rateCode">
                   <el-input disabled v-model="basicForm.rateCode"></el-input>
                 </el-form-item>
               </el-col>

src/views/material/requisition/add/columns.js

@@ -609,7 +609,7 @@ export default function useColumns(){
     // {
     //   item:{
     //     key:'rateCode',
-    //     title:'税类编码',
+    //     title:'物料税类编码',
     //   },
     //   attr:{
     //     is: "el-input",

src/views/purchase/DemandSummary/index.vue

@@ -214,7 +214,7 @@
               </el-col>
 
             <el-col :span="1.5">
-              <el-form-item label="供应商">
+              <el-form-item label="补单供应商">
                 <el-select clearable size="mini" v-model="queryParams.additionalSupplier" @focus="chooseRefer('SUPPLIER_PARAM', true, '供应商')" style="width: 200px">
                   <el-option v-for="item in supplierOptions" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>

src/views/purchase/PurchaseDemandList/index.vue

@@ -139,7 +139,7 @@
 
           <el-row>
             <el-col :span="1.5">
-              <el-form-item label="供应商">
+              <el-form-item label="补单供应商">
                 <el-select clearable size="mini" v-model="queryParams.additionalSupplier" @focus="chooseOrg('SUPPLIER_PARAM', true, '供应商')" style="width: 200px">
                   <el-option v-for="item in supplierOptions" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>

src/views/purchase/apply/add/index.vue

@@ -219,14 +219,35 @@
               );
               // 深拷贝一下参数对象
               let param = JSON.parse(JSON.stringify(this.params))
-              console.log('深拷贝对象',param);
+              // console.log('深拷贝对象',param);
               param.priceApplyItems = list
-              const {msg, code} = await SAVE(param);
-              if (code === 200) {
-                this.onHide();
-                this.$emit("success");
-                this.$notify.success(msg);
-                this.delDemandItemList = []
+              param.priceApplyItems.forEach((item, index) => {
+                item.$index = index
+              });
+              let tishi = param.priceApplyItems.filter(item => {return (item.priceDiffer && item.priceDiffer !== 0)})
+              // console.log('筛选', tishi)
+              let tishiMsg = tishi.map(item => {
+                return `第${item.$index+1}行为价格调整`
+              })
+              // console.log(tishiMsg)
+              if(tishiMsg.length !== 0) {
+                this.$modal.confirm(tishiMsg+ '请核对后再次提交').then(async () =>{
+                  const {msg, code} = await SAVE(param);
+                  if (code === 200) {
+                    this.onHide();
+                    this.$emit("success");
+                    this.$notify.success(msg);
+                    this.delDemandItemList = []
+                  }
+                }).catch(() => {});
+              } else {
+                  const {msg, code} = await SAVE(param);
+                  if (code === 200) {
+                    this.onHide();
+                    this.$emit("success");
+                    this.$notify.success(msg);
+                    this.delDemandItemList = []
+                  }
               }
             } catch (err) {
               // catch
@@ -261,6 +282,8 @@
               if (res.code === 200) {
                 rowList = res.rows
               }
+            }).catch(err => {
+              this.$modal.closeLoading();
             })
             const {
               puOrg,

src/views/purchase/apply/columns.js

@@ -178,7 +178,7 @@ export default function useColumns() {
         rangeSeparator: "至",
         startPlaceholder: "开始日期",
         endPlaceholder: "结束日期",
-        valueFormat: "yyyy-MM-dd hh:mm:ss",
+        valueFormat: "yyyy-MM-dd HH:mm:ss",
       },
     },
   ];

src/views/purchase/apply/copy/index.vue

@@ -265,14 +265,35 @@
               );
               // 深拷贝一下参数对象
               let param = JSON.parse(JSON.stringify(this.params))
-              console.log('深拷贝对象',param);
+              // console.log('深拷贝对象',param);
               param.priceApplyItems = list
-              const {msg, code} = await SAVE(param);
-              if (code === 200) {
-                this.onHide();
-                this.$emit("success");
-                this.$notify.success(msg);
-                this.delDemandItemList = []
+              param.priceApplyItems.forEach((item, index) => {
+                item.$index = index
+              });
+              let tishi = param.priceApplyItems.filter(item => {return (item.priceDiffer && item.priceDiffer !== 0)})
+              console.log('筛选', tishi)
+              let tishiMsg = tishi.map(item => {
+                return `第${item.$index+1}行为价格调整`
+              })
+              console.log(tishiMsg)
+              if(tishiMsg.length !== 0) {
+                this.$modal.confirm(tishiMsg+ '请核对后再次提交').then(async () =>{
+                  const {msg, code} = await SAVE(param);
+                  if (code === 200) {
+                    this.onHide();
+                    this.$emit("success");
+                    this.$notify.success(msg);
+                    this.delDemandItemList = []
+                  }
+                }).catch(() => {});
+              } else {
+                  const {msg, code} = await SAVE(param);
+                  if (code === 200) {
+                    this.onHide();
+                    this.$emit("success");
+                    this.$notify.success(msg);
+                    this.delDemandItemList = []
+                  }
               }
             } catch (err) {
               // catch
@@ -307,6 +328,8 @@
               if (res.code === 200) {
                 rowList = res.rows
               }
+            }).catch(err => {
+              this.$modal.closeLoading();
             })
             const {
               puOrg,

src/views/purchase/apply/edit/index.vue

@@ -284,14 +284,32 @@
               );
               // 深拷贝一下参数对象
               let param = JSON.parse(JSON.stringify(this.params))
-              console.log('深拷贝对象',param);
+              // console.log('深拷贝对象',param);
               param.priceApplyItems = list
-              const {msg, code} = await SAVE(param);
-              if (code === 200) {
-                this.onHide();
-                this.$emit("success");
-                this.$notify.success(msg);
-                this.delDemandItemList = []
+              let tishi = param.priceApplyItems.filter(item => {return (item.priceDiffer && item.priceDiffer !== 0)})
+              console.log('筛选', tishi)
+              let tishiMsg = tishi.map(item => {
+                return `第${item.$index+1}行为价格调整`
+              })
+              console.log(tishiMsg)
+              if(tishiMsg.length !== 0) {
+                this.$modal.confirm(tishiMsg+ '请核对后再次提交').then(async () =>{
+                  const {msg, code} = await SAVE(param);
+                  if (code === 200) {
+                    this.onHide();
+                    this.$emit("success");
+                    this.$notify.success(msg);
+                    this.delDemandItemList = []
+                  }
+                }).catch(() => {});
+              } else {
+                  const {msg, code} = await SAVE(param);
+                  if (code === 200) {
+                    this.onHide();
+                    this.$emit("success");
+                    this.$notify.success(msg);
+                    this.delDemandItemList = []
+                  }
               }
             } catch (err) {
               // catch
@@ -326,6 +344,8 @@
               if (res.code === 200) {
                 rowList = res.rows
               }
+            }).catch(err => {
+              this.$modal.closeLoading();
             })
             const {
               puOrg,