Răsfoiți Sursa

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

001295 1 an în urmă
părinte
comite
71db12d46a

Fișier diff suprimat deoarece este prea mare
+ 887 - 254
src/views/purchase/PurchaseDemandList/add.vue


+ 154 - 0
src/views/purchase/PurchaseDemandList/columns.js

@@ -0,0 +1,154 @@
+export default function useColumns() {
+
+  const TableColumns = [
+    { item: { key: "code", title: "需求单号", width: 150 }, attr: {} },
+    { item: { key: "demandDate", title: "需求日期", width: 150 }, attr: {} },
+    { item: { key: "createTime", title: "制单日期", width: 150 }, attr: {} },
+    { item: { key: "planType", title: "需求计划", width: 150 }, attr: { is: "el-dict-tag", dictName: "sys_plan_type" } },
+    { item: { key: "approverFinishTime", title: "审批结束日期", width: 150 }, attr: {} },
+    { item: { key: "status", title: "单据状态", width: 150 }, attr: { is: "el-dict-tag", dictName: "sys_status" } },
+    { item: { key: "billType", title: "业务类型", width: 150 }, attr: { is: "el-dict-tag", dictName: "sys_business" } },
+    { item: { key: "demandPersonalName", title: "需求人员", width: 150 }, attr: {} },
+    { item: { key: "customerName", title: "需求客户", width: 150 }, attr: {} },
+    { item: { key: "demandDeptName", title: "需求部门", width: 150 }, attr: {} },
+    { item: { key: "source", title: "单据来源", width: 150 }, attr: { is: "el-dict-tag", dictName: "sys_bill_source" } },
+    { item: { key: "approveUser", title: "当前审批人", width: 150 }, attr: {} },
+    { item: { key: "remark", title: "备注", width: 150 }, attr: {} },
+  ].map(({ item, attr }) => ({
+    attr,
+    item: {
+      ...item,
+      width: item.width || 160,
+      sortabled: true,
+      fixedabled: true,
+      filterabled: true,
+      hiddenabled: true,
+    },
+  }));
+
+
+  const SearchColumns = [
+    {
+      item: { key: "code", title: "需求单号" },
+      attr: {
+        is: "el-input",
+        clearable: true,
+      },
+    },
+    {
+      item: { key: "customerName", title: "需求客户" },
+      attr: {
+        is: "el-popover-select-v2",
+        referName: "CUSTOMER_PARAM",
+        valueKey: "name",
+        dataMapping: {
+          customer: "id",
+          customerName: "name"
+        },
+      },
+    },
+    {
+      item: { key: "isCustomerSpecified", title: "是否客户指定" },
+      attr: {
+        is: "el-select",
+        dictName: "sys_yes_no",
+        clearable: true,
+      },
+    },
+    {
+      item: { key: "demandPersonalName", title: "需求人员" },
+      attr: {
+        is: "el-popover-select-v2",
+        referName: "CONTACTS_PARAM",
+        valueKey: "name",
+        dataMapping: {
+          demandPersonal: "code",
+          demandPersonalName: "name"
+        },
+      },
+    },
+    {
+      item: { key: "source", title: "单据来源" },
+      attr: {
+        is: "el-select",
+        dictName: "sys_bill_source",
+        clearable: true,
+      },
+    },
+    {
+      item: { key: "billType", title: "业务类型" },
+      attr: {
+        is: "el-select",
+        dictName: "sys_business",
+        clearable: true,
+      },
+    },
+    {
+      item: { key: "demandDeptName", title: "需求部门" },
+      attr: {
+        is: "el-popover-select-v2",
+        referName: "DEPT_PARAM",
+        valueKey: "name",
+        dataMapping: {
+          demandDept: "id",
+          demandDeptName: "name"
+        },
+      },
+    },
+    {
+      item: { width: 100, key: "demandDate", title: "需求日期", },
+      attr: {
+        clearable: true,
+        is: "el-date-picker",
+        type: "date",
+        valueFormat: "yyyy-MM-dd",
+      },
+    },
+    {
+      item: { key: "materialCode", title: "物料编码" },
+      attr: {
+        is: "el-input",
+        clearable: true,
+      },
+    },
+    {
+      item: { key: "status", title: "单据状态" },
+      attr: {
+        is: "el-select",
+        dictName: "sys_status",
+        clearable: true,
+      },
+    },
+    {
+      item: { key: "planType", title: "需求计划" },
+      attr: {
+        is: "el-select",
+        dictName: "sys_plan_type",
+        clearable: true,
+      },
+    },
+    {
+      item: { width: 100, key: "createTimeString", title: "制单日期", },
+      attr: {
+        clearable: true,
+        is: "el-date-picker",
+        type: "date",
+        valueFormat: "yyyy-MM-dd",
+      },
+    },
+    {
+      item: { key: "additionalSupplierName", title: "补单供应商" },
+      attr: {
+        is: "el-popover-select-v2",
+        referName: "SUPPLIER_PARAM",
+        valueKey: "name",
+        dataMapping: {
+          additionalSupplier: "id",
+          additionalSupplierName: "name"
+        },
+      },
+    },
+  ];
+
+  return { TableColumns, SearchColumns }
+}

+ 14 - 0
src/views/purchase/PurchaseDemandList/dicts.js

@@ -0,0 +1,14 @@
+import { initDicts } from "@/utils/init.js";
+const modules = require.context("./", true, /columns.js$/);
+const columns = [];
+modules.keys().forEach((fileName) => {
+  const data = modules(fileName).default();
+  for (const key in data) {
+    if (key === "TabColumns") {
+      columns.push(...data[key].map((item) => item.TableColumns).flat());
+    } else {
+      columns.push(...data[key]);
+    }
+  }
+});
+export const dicts = initDicts(columns);

+ 969 - 0
src/views/purchase/PurchaseDemandList/index copy.vue

@@ -0,0 +1,969 @@
+<template>
+  <div id="PurchaseDemandList">
+    <div v-if="isList">
+      <el-card style="position: relative;">
+        <el-form class="search_area" label-width="100px">
+          <el-row :gutter="10">
+            <el-col :span="1.5">
+              <el-form-item label="需求单号">
+                <el-input
+                  v-model.trim="queryParams.code"
+                  size="mini"
+                  clearable
+                  style="width: 200px"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="1.5">
+              <el-form-item label="需求客户">
+                <el-select clearable size="mini" v-model="queryParams.customer" @focus="chooseOrg('CUSTOMER_PARAM', true, '需求客户')" style="width: 200px">
+                  <el-option v-for="item in customerOptions" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="1.5">
+              <el-form-item label="是否客户指定">
+                <el-select clearable v-model="queryParams.isCustomerSpecified" size="mini" style="width: 200px" placeholder="请选择">
+                  <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="1.5">
+              <el-form-item label="需求人员">
+                <el-select clearable size="mini" v-model="queryParams.demandPersonal" @focus="chooseOrg('CONTACTS_PARAM', true, '需求人员')" style="width: 200px">
+                  <el-option v-for="item in personOptions" :key="item.id" :label="item.name" :value="item.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <!-- <el-col :span="1.5"> -->
+              <!-- <el-form-item label="" label-width="20px"> -->
+                <div style="position: absolute;top: 3px;right: 10px;">
+                  <el-button type="primary" size="mini" @click="searchList">搜索</el-button>
+                  <el-button size="mini" plain @click="resetList">重置</el-button>
+                </div>
+              <!-- </el-form-item> -->
+            <!-- </el-col> -->
+          </el-row>
+        <CollapseTransition>
+          <div v-show="expanded">
+          <el-row :gutter="10">
+            <el-col :span="1.5">
+              <el-form-item label="单据来源">
+                <el-select clearable v-model="queryParams.source" size="mini" style="width: 200px">
+                  <el-option v-for="dict in dict.type.sys_bill_source" :key="dict.value" :label="dict.label" :value="dict.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="1.5">
+              <el-form-item label="业务类型">
+                <el-select clearable v-model="queryParams.billType" size="mini" style="width: 200px">
+                  <el-option v-for=" dict in dict.type.sys_business" :key="dict.value" :label="dict.label" :value="dict.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="1.5">
+              <el-form-item label="需求部门">
+                <el-select clearable v-model="queryParams.demandDept" size="mini" @focus="chooseOrg('DEPT_PARAM', true, '需求部门')" style="width: 200px">
+                  <el-option
+                    v-for="item in deptOptions"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="1.5">
+              <el-form-item label="需求日期">
+                <el-date-picker
+                  v-model="queryParams.demandDate"
+                  type="date"
+                  clearable
+                  value-format="yyyy-MM-dd"
+                  size="mini"
+                  style="width: 200px"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          
+          <el-row :gutter="10">
+            <el-col :span="1.5">
+              <el-form-item label="物料编码">
+                <el-input
+                  v-model.trim="queryParams.materialCode"
+                  size="mini"
+                  clearable
+                  style="width: 200px"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="1.5">
+              <el-form-item label="单据状态">
+                <el-select clearable v-model="queryParams.status" size="mini" style="width: 200px">
+                  <el-option v-for=" dict in dict.type.sys_status" :key="dict.value" :label="dict.label" :value="dict.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="1.5">
+              <el-form-item label="需求计划">
+                <el-select clearable v-model="queryParams.planType" size="mini" style="width: 200px">
+                  <el-option v-for="dict in dict.type.sys_plan_type" :key="dict.value" :label="dict.label" :value="dict.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="1.5">
+              <el-form-item label="制单日期">
+                <el-date-picker
+                  v-model="queryParams.createTimeString"
+                  type="date"
+                  clearable
+                  value-format="yyyy-MM-dd"
+                  size="mini"
+                  style="width: 200px"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="1.5">
+              <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>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          </div>
+        </CollapseTransition>
+        </el-form>
+        <el-divider class="lines"><i style="cursor: pointer;" :class="expanded?'el-icon-arrow-up':'el-icon-arrow-down'" @click="drop"></i></el-divider>
+
+        
+        <div class="btn_grooup">
+          <el-button type="primary" size="mini" @click="demandWindow">需求窗口期</el-button>
+          <el-button type="primary" size="mini" @click="addDivision">新增</el-button>
+
+          <el-dropdown size="mini" @command="handleCommand">
+            <el-button size="mini" type="primary" style="margin-left: 10px;">
+              导入<i class="el-icon-arrow-down el-icon--right"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item command="数据导入">数据导入</el-dropdown-item>
+              <el-dropdown-item command="模板下载">模板下载</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+
+          <el-dropdown size="mini" @command="handleExport">
+            <el-button size="mini" type="primary" style="margin: 0 10px;">
+              导出<i class="el-icon-arrow-down el-icon--right"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item command="选中导出">选中导出</el-dropdown-item>
+              <el-dropdown-item command="全部导出">全部导出</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+
+          <el-button type="primary" size="mini" @click="delItems">删除</el-button>
+          <!-- <el-button type="primary" size="mini">打印</el-button> -->
+        </div>
+        
+        <el-super-ux-table
+          v-loading="loading"
+          v-model="tableList"
+          :columns="TableColumns"
+          size="mini"
+          :dict="dict"
+          index
+          checkbox
+          class="exporttable"
+          :height=410
+          border
+          highlight-current-row
+          convenitentOperation
+          storage-key="PurchaseDemandList"
+          style="font-size: 12px;"
+          @selection-change="handleSelectionChange"
+          @row-click="rowSelect"
+          @row-dblclick="doubleClick"
+          ref="tables"
+        >
+          <!-- <ux-table-column show-overflow-tooltip type="selection" width="55" fixed="left"/>
+          <ux-table-column show-overflow-tooltip title="序号" type="index" align="center" width="50px" fixed="left"/>
+          <ux-table-column show-overflow-tooltip title="需求单号" align="center" width="170" field="code"/>
+          <ux-table-column show-overflow-tooltip title="需求日期" align="center" width="100" field="demandDate"/>
+          <ux-table-column show-overflow-tooltip title="制单日期" align="center" width="100" field="createTime"/>
+          <ux-table-column show-overflow-tooltip title="需求计划" align="center" width="120" field="planType" :formatter="formatterPlanType"/>
+          <ux-table-column show-overflow-tooltip title="审批结束日期" align="center" width="120" field="approverFinishTime"/>
+          <ux-table-column show-overflow-tooltip title="单据状态" align="center" field="status" :formatter="formatterStatus"/>
+          <ux-table-column show-overflow-tooltip title="业务类型" align="center" width="120" field="billType" :formatter="formatterBillType"/>
+          <ux-table-column show-overflow-tooltip title="需求人员" align="center" field="demandPersonalName" />
+          <ux-table-column show-overflow-tooltip title="需求客户" align="center" field="customerName" width="150"/>
+          <ux-table-column show-overflow-tooltip title="需求部门" align="center" field="demandDeptName" width="150"/>
+          <ux-table-column show-overflow-tooltip title="单据来源" align="center" field="source" width="120" :formatter="formatterSource"/>
+          <ux-table-column show-overflow-tooltip title="当前审批人" align="center" width="120" field="approveUser" />
+          <ux-table-column show-overflow-tooltip title="备注" align="center" width="150" field="remark" /> -->
+          <ux-table-column
+          fixed="right"
+          title="操作"
+          align="center"
+          width="180"
+          >
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="check(scope.row)">查看</el-button>
+            <el-button type="text" size="mini" v-if="scope.row.status == '0' || scope.row.status == '3' || scope.row.status == '9'" @click="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="mini" v-if="scope.row.status == '0' || scope.row.status == '3' || scope.row.status == '9'" @click="commit(scope.row)">提交</el-button>
+            <el-button type="text" size="mini" v-if="scope.row.status == '1' && scope.row.flowId" @click="reback(scope.row)">收回</el-button>
+            <el-button type="text" size="mini" v-if="scope.row.status == '0' || scope.row.status == '3' || scope.row.status == '9'" @click="deleteids(scope.row)">删除</el-button>
+          </template>
+        </ux-table-column>
+        </el-super-ux-table>
+
+        <el-pagination
+          background
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="queryParams.pageNum"
+          :page-sizes="[10, 20, 50, 100, 200, 500]"
+          :page-size="50"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total=total>
+        </el-pagination>
+      </el-card>
+    </div>
+
+    <!-- 用户导入对话框 -->
+    <el-dialog title="数据导入" :visible.sync="upload.open" width="400px">
+      <el-upload
+      ref="upload"
+      :limit="1"
+      accept=".xlsx, .xls"
+      :headers="upload.headers"
+      :action="upload.url + '?updateSupport=' + upload.updateSupport"
+      :disabled="upload.isUploading"
+      :on-progress="handleFileUploadProgress"
+      :on-success="handleFileSuccess"
+      :on-error="errorFile"
+      :auto-upload="false"
+      drag
+      >
+      <i class="el-icon-upload"></i>
+      <div class="el-upload__text">
+        将文件拖到此处,或
+        <em>点击上传</em>
+      </div>
+      <!-- <div class="el-upload__tip" slot="tip">
+        <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+      </div> -->
+      <div class="el-upload__tip" style="color:red" slot="tip">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
+      </el-upload>
+      <div slot="footer">
+      <el-button size="mini" type="primary" @click="submitFileForm">确 定</el-button>
+      <el-button size="mini" @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 模板下载新增参数 -->
+    <el-dialog title="需求模板下载" :visible.sync="download.open" @close="clearDownload" width="400px">
+      <el-row style="margin-bottom: 20px;">
+        <span style="margin-right: 10px;">需求计划</span>
+        <el-select size="mini" v-model="download.planType">
+          <el-option v-for="dict in dict.type.sys_plan_type" :key="dict.value" :label="dict.label" :value="dict.value">
+          </el-option>
+        </el-select>
+      </el-row>
+      <el-row style="margin-bottom: 20px;">
+        <span style="margin-right: 10px;">需求客户</span>
+        <el-select clearable size="mini" v-model="download.customer" @clear="download.customer = ''" @focus="chooseOrg('CUSTOMER_PARAM', true, '选择客户')">
+          <el-option v-for="item in mBcustomer" :key="item.id" :label="item.name" :value="item.code" />
+        </el-select>
+      </el-row>
+      <el-row style="margin-bottom: 20px;">
+        <span style="margin-right: 10px;">供应仓库</span>
+        <el-select clearable size="mini" v-model="download.warehouse" @clear="cleanMb" @focus="chooseOrg('WAREHOUSE_PARAM', true, '选择仓库')">
+          <el-option v-for="item in mBwarehouse" :key="item.id" :label="item.name" :value="item.code" />
+        </el-select>
+      </el-row>
+      <el-row style="margin-bottom: 20px;">
+        <span style="margin-right: 10px;">供应货位</span>
+        <el-select clearable size="mini" v-model="download.cargoSpace" @clear="download.cargoSpace = ''" @focus="mbHuowei('ALLOCATION_PARAM', true, '选择货位', download.warehouseId)">
+          <el-option v-for="item in mBcargoSpace" :key="item.id" :label="item.name" :value="item.code" />
+        </el-select>
+      </el-row>
+      <el-row style="margin-bottom: 20px;">
+        <span style="margin-right: 10px;">品类选择</span>
+        <el-select
+        v-model="download.category"
+        size="mini"
+        clearable
+        @focus="chooseTreeRefer('MATERIALCLASSIFY_PARAM', false, '选择品类')"
+        >
+          <el-option v-for="item in classOptions" :key="item.id" :label="item.name" :value="item.code" />
+        </el-select>
+      </el-row>
+      <div slot="footer">
+      <el-button size="mini" type="primary" @click="mbDownload">模板下载</el-button>
+      <el-button size="mini" @click="download.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 需求窗口期 -->
+    <el-dialog title="需求窗口期" :visible.sync="setDemand.open" @close="closeDemand" width="800px">
+      <div slot="footer">
+        <el-button size="mini" @click="setDemand.open = false">取 消</el-button>
+        <el-button type="primary" size="mini" @click="saveDemand">保 存</el-button>
+      </div>
+      <el-table
+        :data="setDemand.gridData"
+      >
+        <el-table-column property="ways" label="方案">
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.ways" size="mini" disabled>
+              <el-option v-for="dict in dict.type.sys_plan_type" :key="dict.value" :label="dict.label" :value="dict.value">
+              </el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column property="category" label="类型">
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.category" size="mini" disabled>
+              <el-option v-for="dict in dict.type.sys_plan_type" :key="dict.value" :label="dict.label" :value="dict.value">
+              </el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column property="deadline" label="截止星期">
+          <template slot-scope="scope">
+            <el-input-number size="mini" :min=1 :max="scope.row.ways == 'ZJH' ? 7 : 12 " v-model="scope.row.deadline" clearable @input=changeDeadline(scope.row)></el-input-number>
+          </template>
+        </el-table-column>
+        <el-table-column property="remark" label="备注">
+          <template slot-scope="scope">
+            <el-input size="mini" v-model="scope.row.remark" clearable></el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- <span style="color: red">注:周计划星期填写范围1-7,月计划填写范围1-12</span> -->
+    </el-dialog>
+
+    <Add v-model="isList" v-if="!isList" :pageStu="page" :disable="disable" :row="rowDetail" @refresh="searchList"/>
+  
+    <Refers ref="refer" @doSubmit="selectionsToInput" :single="true"/>
+
+    <TreeRefers ref="tree" @doSubmit="selectionsToInput2" :single="true"/>
+  </div>
+</template>
+
+<script>
+// 导入的token
+import { getToken } from "@/utils/auth";
+import Add from './add.vue'
+import Refers from '@/components/Refers/refers.vue'
+import TreeRefers from '@/components/Refers/sigleTreeRefer.vue'
+import CollapseTransition from '@/components/MyCollapse/collapse.vue'
+// 流程收回
+import { rebacktWork } from '@/api/purchase/workSpace.js'
+import {getDemandList, delDemand, downLoadDemand, exportDemand, submitDemand, confirmSubmit, getDemandWindowList, saveDemandWindow } from '@/api/purchase/purchaseDemand.js'
+export default {
+  name: 'PurchaseDemandList',
+  components: {
+    Add,
+    CollapseTransition,
+    Refers,
+    TreeRefers,
+    ElSuperUxTable: () => import("@/components/super-ux-table/index.vue"),
+  },
+  dicts: ['sys_processing_mode', 'sys_status', 'sys_bill_source', 'sys_business', 'sys_reserve_ratio', 'sys_period_unit', 'sys_price_type', 'sys_plan_type', 'oa_templete_id'],
+  data() {
+    return {
+      loading: true,
+      // 导入参数
+      upload: {
+        // 是否显示弹出层(导入)
+        open: false,
+        // 弹出层标题(导入)
+        title: "数据导入",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 1,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/pu/demand/import"
+      },
+      // 模板下载参数
+      download: {
+        open: false,
+        planType: 'ZJH',
+        customer: '',
+        warehouse: '',
+        warehouseId: '',
+        cargoSpace: '',
+        category: ''
+      },
+      mBcustomer: [],
+      mBwarehouse: [],
+      mBcargoSpace: [],
+      classOptions: [],
+      // 下拉收起配置
+      expanded: false,
+      // 页面配置
+      isList: true,
+      // 页面状态
+      page: '',
+      queryParams: {
+        code: this.$route.query.billCode,
+        customer: '',
+        isCustomerSpecified: '',
+        demandPersonal: '',
+        source: '',
+        planType: '',
+        billType: '',
+        demandDept: '',
+        demandDate: '',
+        remark: '',
+        createTimeString: '',
+        materialCode: '',
+        status: '',
+        additionalSupplier: '',
+        pageNum: 1,
+        pageSize: 50
+      },
+      referCondition: {
+        type: '',
+        isPage: true,
+        title: ''
+      },
+      options: [{
+        value: 'Y', label: '是',
+      }, {
+        value: 'N', label: '否'
+      }],
+      customerOptions: [],
+      personOptions: [],
+      deptOptions: [],
+      supplierOptions: [],
+      tableList: [],
+      total: 0,
+      rowDetail: {},
+      disable: false,
+      ids: [],
+      TableColumns: [
+        { item: { key: "code", title: "需求单号", width: 150 }, attr: {} },
+        { item: { key: "demandDate", title: "需求日期", width: 150 }, attr: {} },
+        { item: { key: "createTime", title: "制单日期", width: 150 }, attr: {} },
+        { item: { key: "planType", title: "需求计划", width: 150 }, attr: { is: "el-dict-tag", dictName: "sys_plan_type" } },
+        { item: { key: "approverFinishTime", title: "审批结束日期", width: 150 }, attr: {} },
+        { item: { key: "status", title: "单据状态", width: 150 }, attr: { is: "el-dict-tag", dictName: "sys_status" } },
+        { item: { key: "billType", title: "业务类型", width: 150 }, attr: { is: "el-dict-tag", dictName: "sys_business" } },
+        { item: { key: "demandPersonalName", title: "需求人员", width: 150 }, attr: {} },
+        { item: { key: "customerName", title: "需求客户", width: 150 }, attr: {} },
+        { item: { key: "demandDeptName", title: "需求部门", width: 150 }, attr: {} },
+        { item: { key: "source", title: "单据来源", width: 150 }, attr: { is: "el-dict-tag", dictName: "sys_bill_source" } },
+        { item: { key: "approveUser", title: "当前审批人", width: 150 }, attr: {} },
+        { item: { key: "remark", title: "备注", width: 150 }, attr: {} },
+      ].map(({ item, attr }) => ({
+    attr,
+    item: {
+      ...item,
+      sortabled: true,
+      fixedabled: true,
+      filterabled: true,
+      hiddenabled: true,
+    },
+  })),
+    setDemand: {
+      open: false,
+      gridData: []
+    }
+    }
+  },
+  created() {
+    this.getList(this.queryParams)
+  },
+  methods: {
+    // 格式化表格内容
+    formatterPlanType(row) {
+      switch(row.planType){
+        case 'ZJH':
+          return '周计划'
+        case 'YJH':
+          return '月计划'
+        case 'JJXQ':
+          return '紧急计划'
+      }
+    },
+    formatterStatus(row) {
+      switch(row.status){
+        case '0':
+          return '未提交'
+        case '1':
+          return '审批中'
+        case '2':
+          return '已完成'
+        case '3':
+          return '已驳回'
+        case '9':
+          return '已回退'
+      }
+    },
+    formatterBillType(row) {
+      switch (row.billType) {
+        case 'ZQBH':
+          return '周期备货'
+        case 'FXXQ':
+          return '分销需求'
+        case 'TSXQ':
+          return '特殊采购需求'
+        case 'BDXQ':
+          return '补单需求'
+        case 'JJXQ':
+          return '紧急需求单'
+        case 'XPXQ':
+          return '新品需求'
+        case 'HZBM':
+          return '合作部门需求'
+        case 'DZBH':
+          return '大宗备货'
+        case 'XZCG':
+          return '行政类采购'
+      }
+    },
+    formatterSource(row) {
+      switch (row.source) {
+        case '1':
+          return '手工导入'
+        case '2':
+          return '按客户计算'
+        case '3':
+          return '按仓库计算'
+        case '4':
+          return '手工新增'
+      }
+    },
+    searchList() {
+      this.getList(this.queryParams)
+    },
+    resetList() {
+      this.queryParams = {
+        code: '',
+        customer: '',
+        isCustomerSpecified: '',
+        demandPersonal: '',
+        source: '',
+        planType: '',
+        billType: '',
+        demandDept: '',
+        demandDate: '',
+        remark: '',
+        createTimeString: '',
+        materialCode: '',
+        status: '',
+        additionalSupplier: '',
+        pageNum: 1,
+        pageSize: 50
+      }
+      this.getList(this.queryParams)
+    },
+    getList(params){
+      getDemandList(params).then(res => {
+        if (res.code === 200) {
+          this.tableList = res.rows
+          this.total = res.total
+        }
+      }).then(() => {
+        this.loading = false
+      }).catch(err => {
+        this.loading = false
+      })
+    },
+    handleSelectionChange(selection) {
+      console.log('选中', selection)
+      this.ids = selection.map(item => item.id)
+      console.log('选中数组', this.ids.join())
+    },
+    mbDownload() {
+      this.$modal.loading("正在下载模板,请稍后...");
+      downLoadDemand(this.download).then(res => {
+        this.$modal.closeLoading();
+        const blob = new Blob([res], {
+          type: "application/vnd.ms-excel;charset=UTF-8",
+        });// 创建一个类文件对象:Blob对象表示一个不可变的、原始数据的类文件对象
+        const downloadElement = document.createElement("a"); //创建a标签
+        const href = window.URL.createObjectURL(blob); // 创建下载的链接
+        // var temp = res.headers["content-disposition"]; 
+        // var fileName = decodeURIComponent(temp.split("filename=")[1]); // 中文需要转码 (前端乱码)
+        // var name = fileName.split(";")[0]; //切割成文件名
+        downloadElement.href = href;  //下载地址
+        downloadElement.download = '采购需求单模板'+ this.parseTime(new Date().getTime()) + ".xlsx"; // 下载后文件名
+        document.body.appendChild(downloadElement);
+        downloadElement.click(); // 点击下载
+        document.body.removeChild(downloadElement); // 下载完成移除元素
+        window.URL.revokeObjectURL(href); // 释放blob对象
+        this.download.open = false
+      }).catch(err => {
+        this.$modal.closeLoading();
+      })
+    },
+    // 关闭模板下载弹窗清空参数
+    clearDownload() {
+      // 模板下载参数
+      this.download =  {
+        open: false,
+        planType: 'ZJH',
+        customer: '',
+        warehouse: '',
+        warehouseId: '',
+        cargoSpace: '',
+        category: ''
+      }
+    },
+    handleCommand(command) {
+      // alert(command)
+      if(command == '模板下载') {
+        this.download.open = true
+      }
+      if (command == '数据导入') {
+        this.upload.title = "用户导入"
+        this.upload.open = true
+      }
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+      this.$modal.loading("正在导入数据,请稍后...");
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.$modal.closeLoading();
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
+      this.getList(this.queryParams);
+    },
+    errorFile(err) {
+      this.$modal.closeLoading();
+      this.$modal.notifyError("文件已变动,请重新上传");
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },
+    handleExport(command) {
+      if(command == '选中导出') {
+        if (this.ids.length == 0) {
+          this.$modal.notifyWarning("请选中至少一条数据");
+        } else {
+          this.$modal.loading("正在导出数据,请稍后...");
+          let param = {all: false, ids: this.ids}
+          exportDemand(param).then(res => {
+            this.$modal.closeLoading();
+            const blob = new Blob([res], {
+              type: "application/vnd.ms-excel;charset=UTF-8",
+            });// 创建一个类文件对象:Blob对象表示一个不可变的、原始数据的类文件对象
+            const downloadElement = document.createElement("a"); //创建a标签
+            const href = window.URL.createObjectURL(blob); // 创建下载的链接
+            // var temp = res.headers["content-disposition"]; 
+            // var fileName = decodeURIComponent(temp.split("filename=")[1]); // 中文需要转码 (前端乱码)
+            // var name = fileName.split(";")[0]; //切割成文件名
+            downloadElement.href = href;  //下载地址
+            downloadElement.download = '采购需求单选中导出' + this.parseTime(new Date().getTime()) + ".xlsx"; // 下载后文件名
+            document.body.appendChild(downloadElement);
+            downloadElement.click(); // 点击下载
+            document.body.removeChild(downloadElement); // 下载完成移除元素
+            window.URL.revokeObjectURL(href); // 释放blob对象
+          }).catch(err => {
+            this.$modal.closeLoading();
+          })
+        }
+      } else {
+        this.$modal.loading("正在导出数据,请稍后...");
+        let param2 = {all: true}
+        exportDemand(param2).then(res => {
+          this.$modal.closeLoading();
+          const blob = new Blob([res], {
+            type: "application/vnd.ms-excel;charset=UTF-8",
+          });// 创建一个类文件对象:Blob对象表示一个不可变的、原始数据的类文件对象
+          const downloadElement = document.createElement("a"); //创建a标签
+          const href = window.URL.createObjectURL(blob); // 创建下载的链接
+          // var temp = res.headers["content-disposition"]; 
+          // var fileName = decodeURIComponent(temp.split("filename=")[1]); // 中文需要转码 (前端乱码)
+          // var name = fileName.split(";")[0]; //切割成文件名
+          downloadElement.href = href;  //下载地址
+          downloadElement.download = '采购需求单全部导出' + this.parseTime(new Date().getTime()) + ".xlsx"; 
+          document.body.appendChild(downloadElement);
+          downloadElement.click(); // 点击下载
+          document.body.removeChild(downloadElement); // 下载完成移除元素
+          window.URL.revokeObjectURL(href); // 释放blob对象
+        }).catch(err => {
+          this.$modal.closeLoading();
+        })
+      }
+    },
+    addDivision() {
+      this.isList = false
+      this.page = 'add'
+      this.disable = false
+    },
+    check(row) {
+      this.isList = false
+      this.page = 'check'
+      this.rowDetail = row
+      this.disable = true
+    },
+    doubleClick(row) {
+      this.isList = false
+      this.page = 'check'
+      this.rowDetail = row
+      this.disable = true
+    },
+    // 表格选中数据
+    rowSelect(row) {
+
+      this.$refs.tables.toggleRowSelection([{row: row}]);
+    },
+    edit(row) {
+      this.isList = false
+      this.page = 'edit'
+      this.rowDetail = row
+      this.disable = false
+    },
+    commit(row) {
+      console.log('row', row)
+      this.$modal.loading("提交中...");
+      submitDemand(row).then(res => {
+        if (res.code === 200) {
+          this.$modal.notifySuccess("提交成功");
+          this.$modal.closeLoading();
+          this.getList(this.queryParams)
+        }
+        if (res.code === 233) {
+          this.$modal.confirm(res.msg).then(function() {
+            // 确认
+          }).then(() => {
+            confirmSubmit(row).then(res => {
+              if (res.code === 200) {
+                this.$modal.notifySuccess("提交成功");
+                this.$modal.closeLoading();
+                this.getList(this.queryParams)
+              }
+            }).catch(err => {
+              this.$modal.closeLoading();
+            })
+            // 取消
+          }).catch(() => {
+            this.$modal.closeLoading();
+          })
+          this.$modal.closeLoading();
+        }
+      }).catch(err => {
+        this.$modal.closeLoading();
+      })
+    },
+    // 流程收回
+    reback(row) {
+      this.$modal.loading("收回中...");
+      let params = {
+        billCode: row.code, 
+        fdId: row.flowId, 
+        fdTemplateId: this.dict.type.oa_templete_id.find(item => {
+          return item.label == "采购需求单"
+        }).value,
+        billMaker: row.createBy 
+      }
+      rebacktWork(params).then(res => {
+        if (res.code === 200) {
+          this.$modal.notifySuccess("收回成功");
+          this.$modal.closeLoading();
+          this.getList(this.queryParams)
+        }
+      }).catch(err => {
+        this.$modal.closeLoading();
+      })
+    },
+    // 行内删除
+    deleteids(row) {
+      console.log('row', row)
+      this.$modal.confirm('确定删除选择数据?').then(() => {
+        delDemand(row.id).then(res => {
+          if (res.code === 200) {
+            this.$modal.notifySuccess("删除成功");
+            this.getList(this.queryParams)
+          }
+        })
+        }).catch(() => {})
+    },
+    // 批量删除按钮
+    delItems() {
+      if(this.ids.length == 0) {
+        this.$modal.notifyWarning("请选中至少一条数据");
+      } else {
+        let param = this.ids.join()
+        this.$modal.confirm('确认删除选中数据?').then(() => {
+        delDemand(param).then(res => {
+          if (res.code === 200) {
+            this.$modal.notifySuccess("删除成功");
+            this.getList(this.queryParams)
+          }
+        })
+        }).catch(() => {})
+      }
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+      this.queryParams.pageSize = val
+      this.getList(this.queryParams)
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+      this.queryParams.pageNum = val
+      this.getList(this.queryParams)
+    },
+    drop() {
+      this.expanded = !this.expanded
+    },
+    // 搜索区参照选择
+    chooseOrg(type, isPage, title, stordocId) {
+      this.referCondition.type = type
+      this.referCondition.isPage = isPage
+      this.referCondition.title = title
+      this.referCondition.stordocId = stordocId
+      this.$refs.refer.init(this.referCondition)
+    },
+    selectionsToInput(selection) {
+      // 搜索区选择客户
+      if (this.referCondition.type == 'CUSTOMER_PARAM' && this.referCondition.title == '需求客户') {
+        this.customerOptions = selection
+        this.queryParams.customer = selection[0].id
+      }
+      // 模板内选择客户
+      if (this.referCondition.type == 'CUSTOMER_PARAM' && this.referCondition.title == '选择客户') {
+        this.mBcustomer = selection
+        this.download.customer = selection[0].code
+      }
+      // 模板内选择仓库
+      if (this.referCondition.type == 'WAREHOUSE_PARAM' && this.referCondition.title == '选择仓库') {
+        this.mBwarehouse = selection
+        this.download.warehouse = selection[0].code
+        this.download.warehouseId = selection[0].id
+      }
+      // 模板内选择货位
+      if (this.referCondition.type == 'ALLOCATION_PARAM' && this.referCondition.title == '选择货位') {
+        this.mBcargoSpace = selection
+        this.download.cargoSpace = selection[0].code
+      }
+      if (this.referCondition.type == 'CONTACTS_PARAM') {
+        this.personOptions = selection
+        this.queryParams.demandPersonal = selection[0].code
+      }
+      if (this.referCondition.type == 'DEPT_PARAM') {
+        this.deptOptions = selection
+        this.queryParams.demandDept = selection[0].id
+      }
+      if (this.referCondition.type == 'SUPPLIER_PARAM') {
+        this.supplierOptions = selection
+        this.queryParams.additionalSupplier = selection[0].id
+      }
+    },
+    mbHuowei(type, isPage, title, stordocId) {
+      this.referCondition.type = type
+      this.referCondition.isPage = isPage
+      this.referCondition.title = title
+      if(stordocId) {
+        this.referCondition.stordocId = stordocId
+        this.$refs.refer.init(this.referCondition)
+      } else {
+        this.$modal.notifyWarning("请先选择仓库")
+      }
+    },
+    cleanMb() {
+      this.download.warehouse = ''
+      this.download.warehouseId = ''
+    },
+    // 搜索区树形选择
+    chooseTreeRefer(type, isPage, title) {
+      this.referCondition.type = type
+      this.referCondition.isPage = isPage
+      this.referCondition.title = title
+      this.$refs.tree.init(this.referCondition)
+    },
+    selectionsToInput2(selection) {
+      this.classOptions.push(selection)
+      this.download.category = selection.code
+    },
+    // 需求窗口期配置
+    demandWindow() {
+      this.setDemand.open = true
+      this.$nextTick(() => {
+        getDemandWindowList().then(res => {
+          if (res.code === 200) {
+            this.setDemand.gridData = res.rows
+          }
+        })
+      })
+    },
+    saveDemand() {
+      let params = this.setDemand.gridData
+      saveDemandWindow(params).then(res => {
+        if (res.code === 200) {
+          this.$modal.notifySuccess("保存成功");
+          this.setDemand.open = false
+        }
+      })
+    },
+    changeDeadline(row) {
+      row.delFlag = '2'
+    },
+    closeDemand() {}
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+#PurchaseDemandList {
+  padding: 12px;
+  box-sizing: border-box;
+  overflow-y: scroll;
+}
+.btn_grooup {
+  margin-bottom: 10px;
+  display: flex;
+  justify-content: flex-end;
+}
+.lines {
+  margin-top: 0;
+}
+.el-pagination {
+  margin-top: 10px;
+  text-align: right;
+}
+::v-deep .el-table__row > td {
+  border-right: none;
+}
+ ::v-deep .el-card .el-form-item {
+  margin-bottom: 10px;
+}
+</style>
+<style>
+.exporttable {
+  border: solid 1px #c0c0c0;
+}
+.el-table .el-table__header-wrapper th {
+  font-size: 14px;
+}
+</style>

Fișier diff suprimat deoarece este prea mare
+ 534 - 647
src/views/purchase/PurchaseDemandList/index.vue


+ 6 - 2
src/views/purchase/apply/columns.js

@@ -23,7 +23,7 @@ export default function useColumns() {
     { item: { key: "approveUser", title: "当前审批人", width: 100 }, attr: {} },
     {
       item: { key: "isEffective", title: "是否已推价格", width: 100 },
-      attr: { is: "el-dict-tag", dictName: "is_effective"},
+      attr: { is: "el-dict-tag", dictName: "is_effective" },
     },
     {
       item: { key: "approveTime", title: "单据申请日期", width: 100 },
@@ -65,7 +65,11 @@ export default function useColumns() {
         is: "el-popover-select-v2",
         referName: "SUPPLIER_PARAM",
         valueKey: "name",
-        dataMapping: { supplier: "id", supplierName: "name" },
+        dataMapping: {
+          supplier: "id",
+          supplierCode: "code",
+          supplierName: "name",
+        },
       },
     },
     {

+ 1 - 0
src/views/purchase/catalogue/columns.js

@@ -123,6 +123,7 @@ export default function useColumns() {
         valueKey: "name",
         dataMapping: {
           supplier: "id",
+          supplierCode: "code",
           supplierName: "name",
         },
       },

+ 8 - 39
src/views/purchase/transferOrder/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="transferOrder">
     <div v-if="isList">
-      <el-card style="position: relative">
+      <el-card style="position: relative" v-loading="loading">
         <el-super-search
           v-model="params"
           :size="size"
@@ -11,7 +11,7 @@
           @submit="getList(params, Pages)"
         ></el-super-search>
 
-        <div class="btn_grooup">
+        <el-row class="my-4" style="text-align: right">
           <el-button-group style="margin-right: 5px">
             <el-button type="primary" :size="size" @click="addOrder"
               >新增</el-button
@@ -23,7 +23,7 @@
             @temDownload="useImportTemplate"
             :fileSize="2"
           ></BatchImport>
-        </div>
+        </el-row>
 
         <el-super-ux-table
           v-model="tableList"
@@ -48,33 +48,33 @@
             width="160"
           >
             <template slot-scope="scope">
-              <el-button type="text" size="mini" @click="check(scope.row)"
+              <el-button type="text" :size="size" @click="check(scope.row)"
                 >查看</el-button
               >
               <el-button
                 type="text"
-                size="mini"
+                :size="size"
                 v-if="scope.row.status == '0' || scope.row.status == '3'"
                 @click="edit(scope.row)"
                 >编辑</el-button
               >
               <el-button
                 type="text"
-                size="mini"
+                :size="size"
                 v-if="scope.row.status == '0' || scope.row.status == '3'"
                 @click="commit(scope.row)"
                 >提交</el-button
               >
               <el-button
                 type="text"
-                size="mini"
+                :size="size"
                 v-if="scope.row.status == '1'"
                 @click="handleBack(scope.row)"
                 >流程收回</el-button
               >
               <el-button
                 type="text"
-                size="mini"
+                :size="size"
                 v-if="scope.row.status == '0' || scope.row.status == '3'"
                 @click="deleteids(scope.row)"
                 >删除</el-button
@@ -113,7 +113,6 @@
       :row="rowDetail"
       @refresh="getList(params, Pages)"
     />
-    <Refers ref="refer" @doSubmit="selectionsToInput" :single="true" />
   </div>
 </template>
 
@@ -121,8 +120,6 @@
 import useColumns from "./columns";
 import { dicts } from "./dicts";
 import Add from "./add.vue";
-import CollapseTransition from "@/components/MyCollapse/collapse.vue";
-import Refers from "@/components/Refers/refers.vue";
 import {
   getOrderList,
   delOrder,
@@ -136,8 +133,6 @@ export default {
   dicts: [...dicts, "oa_templete_id"],
   components: {
     Add,
-    CollapseTransition,
-    Refers,
     ElSuperUxTable: () => import("@/components/super-ux-table/index.vue"),
     BatchImport: () => import("@/components/BatchImport/index.vue"),
     ElSuperSearch: () => import("@/components/super-search/index.vue"),
@@ -178,9 +173,6 @@ export default {
           label: "否",
         },
       ],
-      chuOrgOptions: [],
-      ruOrgOptions: [],
-      manOptions: [],
       tableList: [],
       // total: 0,
       tabParams: {
@@ -305,20 +297,6 @@ export default {
         .catch(() => {});
     },
 
-    selectionsToInput(selection) {
-      if (this.referCondition.title == "调出库存组织") {
-        this.chuOrgOptions = selection;
-        this.queryParams.deliveryInventoryOrg = selection[0].id;
-      }
-      if (this.referCondition.title == "调入库存组织") {
-        this.ruOrgOptions = selection;
-        this.queryParams.storageInventoryOrg = selection[0].id;
-      }
-      if (this.referCondition.title == "制单人") {
-        this.manOptions = selection;
-        this.queryParams.createBy = selection[0].code;
-      }
-    },
     //模板下载
     useImportTemplate() {
       this.download(
@@ -327,10 +305,6 @@ export default {
         `调拨单导入模板_${new Date().getTime()}.xlsx`
       );
     },
-    //导入
-    useImportData() {
-      console.log("导入");
-    },
     // 上传文件
     async onUpload(file) {
       try {
@@ -380,9 +354,4 @@ export default {
   box-sizing: border-box;
   overflow-y: scroll;
 }
-.btn_grooup {
-  margin: 10px 0;
-  display: flex;
-  justify-content: flex-end;
-}
 </style>

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff