From 2cc8bcc0cba081a7ecbb2753136f69f6c7f32472 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 18 十一月 2025 16:34:26 +0800
Subject: [PATCH] 添加 采购订单 收料通知单 生产订单 编辑页面，调整 单据列表 日期 筛选显示
---
src/views/sell/XsSeOutStockBackBillList.vue | 44
src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue | 54
src/views/sell/XsSeOutStockBackBillEdit.vue | 6
src/views/sell/XsSeOutStockBill.vue | 43
src/store/modules/permission.js | 12
src/router/index.js | 255 ++-
src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue | 73
src/views/ICMO/ScICMOBillEdit.vue | 1472 ++++++++++++++++++++++++
src/views/sell/sellOut/sellOutBill.vue | 1218 ++++++++++++-------
src/views/purchase/cgPoOrderBill/cgPoOrderBillEdit.vue | 146 +-
src/views/ICMO/ScICMOBillList.vue | 109
src/views/sell/xsSeOrderBill/xsSeOrderBillEdit.vue | 13
src/views/sell/XsSeOutStockBillEdit.vue | 6
.env.production | 1
src/views/sell/xsSeOrderBill/xsSeOrderBill.vue | 43
src/views/purchase/cgPoInStockBill/cgPoInStockBillEdit.vue | 143 +-
16 files changed, 2,778 insertions(+), 860 deletions(-)
diff --git a/.env.production b/.env.production
index 2cb25b8..634d712 100644
--- a/.env.production
+++ b/.env.production
@@ -6,3 +6,4 @@
# 鏅轰簯杩堟�滾-MOM绠＄悊绯荤粺/鐢熶骇鐜
VUE_APP_BASE_API = 'http://47.96.97.237/API/'
+
diff --git a/src/router/index.js b/src/router/index.js
index 5072088..5d1bf90 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -357,7 +357,7 @@
name: "CgPoInStockBillList",
meta: { title: "鏀舵枡閫氱煡鍗曞垪琛�", activeMenu: "/purchase/PoInStock" },
},
- {
+ {
path: "/purchase/PoInStock/cgPoInStockBillEdit",
component: () => import("@/views/purchase/cgPoInStockBill/cgPoInStockBillEdit"),
name: "CgPoInStockBillEdit",
@@ -432,14 +432,15 @@
path: "/icmo/scIcmoBill/scIcmoBillList",
component: () => import("@/views/ICMO/ScICMOBillList.vue"),
name: "ScICMOBillList",
- meta: { title: "鐢熶骇璁㈠崟鍒楄〃", activeMenu: "/icmo/scIcmoBill" },
+ meta: { title: "鐢熶骇璁㈠崟缁存姢", activeMenu: "/icmo/scIcmoBill" },
+ },
+ {
+ path: "/icmo/scIcmoBill/scIcmoBillEdit",
+ component: () => import("@/views/ICMO/ScICMOBillEdit.vue"),
+ name: "ScICMOBillEdit",
+ meta: { title: "鐢熶骇璁㈠崟", activeMenu: "/icmo/scIcmoBill" },
},
],
- },
- {
- path: "/ScICMOBillList",
- component: () => import("@/views/ICMO/ScICMOBillList.vue"),
- hidden: true,
},
//渚涘簲鍟嗗垪琛�
{
@@ -460,7 +461,7 @@
},
],
},
-// i鑺傜偣椤甸潰
+ // i鑺傜偣椤甸潰
{
path: '/iframe',
component: () => import('@/layout/emptyLayout'), // 浣跨敤绌哄竷灞�
@@ -483,6 +484,24 @@
component: () => import('@/views/sell/xsSeOrderBill/xsSeOrderBillEdit'), // 閿�鍞鍗�
name: 'IframeXsSeOrderBillEdit',
meta: { title: '閿�鍞鍗�', noCache: true, noLoading: true }
+ },
+ {
+ path: 'CgPoInStockBillEdit',
+ component: () => import('@/views/purchase/cgPoInStockBill/cgPoInStockBillEdit'), // 鏀舵枡閫氱煡鍗�
+ name: 'IframeCgPoInStockBillEdit',
+ meta: { title: '鏀舵枡閫氱煡鍗�', noCache: true, noLoading: true }
+ },
+ {
+ path: 'CgPoOrderBillEdit',
+ component: () => import('@/views/purchase/cgPoOrderBill/cgPoOrderBillEdit'), // 閲囪喘璁㈠崟
+ name: 'IframeCgPoOrderBillEdit',
+ meta: { title: '閲囪喘璁㈠崟', noCache: true, noLoading: true }
+ },
+ {
+ path: 'ScICMOBillEdit',
+ component: () => import('@/views/ICMO/ScICMOBillEdit'), // 鐢熶骇璁㈠崟
+ name: 'IframeScICMOBillEdit',
+ meta: { title: '鐢熶骇璁㈠崟', noCache: true, noLoading: true }
}
]
}, // 瀹㈡埛
@@ -491,7 +510,7 @@
component: () => import("@/views/GyCustomer/index"),
hidden: false,
},
- {
+ {
path: "/basic/gy/gyCustomer",
component: Layout,
hidden: true,
@@ -515,7 +534,7 @@
component: () => import("@/views/gyMaterial/GyMaterial"),
hidden: false,
},
- {
+ {
path: "/basic/gy/gyMaterial",
component: Layout,
hidden: true,
@@ -571,122 +590,122 @@
},
],
},
- //鍣ㄥ叿棰嗙敤鍑哄簱鍗曠淮鎶�
- {
- path: "/scMould/warehouse/Sc_MouldProdOutBillList",
- component: Layout,
- hidden: true,
- redirect: "noredirect",
- meta: {
- breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
- activeMenu: "/scMould/warehouse/Sc_MouldProdOutBillList", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
- },
- children: [
- {
- path: "/scMould/warehouse/Sc_MouldProdOutBillList",
- component: () => import("@/views/scMould/warehouse/Sc_MouldProdOutBillList"),
- name: "Sc_MouldProdOutBillList",
- meta: { title: "鍣ㄥ叿棰嗙敤鍑哄簱鍗曠淮鎶�", activeMenu: "scMould/warehouse" },
- },
- ],
+ //鍣ㄥ叿棰嗙敤鍑哄簱鍗曠淮鎶�
+ {
+ path: "/scMould/warehouse/Sc_MouldProdOutBillList",
+ component: Layout,
+ hidden: true,
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/scMould/warehouse/Sc_MouldProdOutBillList", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
},
- //鍣ㄥ叿棰嗙敤鍑哄簱鍗�
- {
- path: "/scMould/warehouse/Sc_MouldProdOutBillEdit",
- component: Layout,
- hidden: true,
- redirect: "noredirect",
- meta: {
- breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
- activeMenu: "/scMould/warehouse/Sc_MouldProdOutBillEdit", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
- },
- children: [
- {
- path: "/scMould/warehouse/Sc_MouldProdOutBillEdit",
- component: () => import("@/views/scMould/warehouse/Sc_MouldProdOutBillEdit"),
- name: "Sc_MouldProdOutBillEdit",
- meta: { title: "鍣ㄥ叿棰嗙敤鍑哄簱鍗曠紪杈�", activeMenu: "scMould/warehouse" },
- },
- ],
- },
- //鍣ㄥ叿棰嗙敤閫�搴撳崟缁存姢
- {
- path: "/scMould/warehouse/Sc_MouldProdBackBillList",
- component: Layout,
- hidden: true,
- // permissions: ["system:goods:add"],
- redirect: "noredirect",
- meta: {
- breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
- activeMenu: "/scMould/warehouse/Sc_MouldProdBackBillList", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
- },
- children: [
- {
- path: "/scMould/warehouse/Sc_MouldProdBackBillList",
- component: () => import("@/views/scMould/warehouse/Sc_MouldProdBackBillList"),
- name: "Sc_MouldProdBackBillList",
- meta: { title: "鍣ㄥ叿棰嗙敤閫�搴撳崟缁存姢", activeMenu: "scMould/warehouse" },
- },
- ],
- },
- //鍣ㄥ叿棰嗙敤閫�搴撳崟
+ children: [
{
- path: "/scMould/warehouse/Sc_MouldProdBackBillEdit",
- component: Layout,
- hidden: true,
- redirect: "noredirect",
- meta: {
- breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
- activeMenu: "/scMould/warehouse/Sc_MouldProdBackBillEdit", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ path: "/scMould/warehouse/Sc_MouldProdOutBillList",
+ component: () => import("@/views/scMould/warehouse/Sc_MouldProdOutBillList"),
+ name: "Sc_MouldProdOutBillList",
+ meta: { title: "鍣ㄥ叿棰嗙敤鍑哄簱鍗曠淮鎶�", activeMenu: "scMould/warehouse" },
},
- children: [
- {
- path: "/scMould/warehouse/Sc_MouldProdBackBillEdit",
- component: () => import("@/views/scMould/warehouse/Sc_MouldProdBackBillEdit"),
- name: "Sc_MouldProdBackBillEdit",
- meta: { title: "鍣ㄥ叿棰嗙敤閫�搴撳崟缂栬緫", activeMenu: "scMould/warehouse" },
- },
- ],
+ ],
+ },
+ //鍣ㄥ叿棰嗙敤鍑哄簱鍗�
+ {
+ path: "/scMould/warehouse/Sc_MouldProdOutBillEdit",
+ component: Layout,
+ hidden: true,
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/scMould/warehouse/Sc_MouldProdOutBillEdit", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
},
- //鍣ㄥ叿鐩存帴璋冩嫧鍗曠淮鎶�
- {
- path: "/scMould/warehouse/Sc_MouldProdMoveBillList",
- component: Layout,
- hidden: true,
- // permissions: ["system:goods:add"],
- redirect: "noredirect",
- meta: {
- breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
- activeMenu: "/scMould/warehouse/Sc_MouldProdMoveBillList", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ children: [
+ {
+ path: "/scMould/warehouse/Sc_MouldProdOutBillEdit",
+ component: () => import("@/views/scMould/warehouse/Sc_MouldProdOutBillEdit"),
+ name: "Sc_MouldProdOutBillEdit",
+ meta: { title: "鍣ㄥ叿棰嗙敤鍑哄簱鍗曠紪杈�", activeMenu: "scMould/warehouse" },
},
- children: [
- {
- path: "/scMould/warehouse/Sc_MouldProdMoveBillList",
- component: () => import("@/views/scMould/warehouse/Sc_MouldProdMoveBillList"),
- name: "Sc_MouldProdMoveBillList",
- meta: { title: "鍣ㄥ叿鐩存帴璋冩嫧鍗曠淮鎶�", activeMenu: "scMould/warehouse" },
- },
- ],
+ ],
+ },
+ //鍣ㄥ叿棰嗙敤閫�搴撳崟缁存姢
+ {
+ path: "/scMould/warehouse/Sc_MouldProdBackBillList",
+ component: Layout,
+ hidden: true,
+ // permissions: ["system:goods:add"],
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/scMould/warehouse/Sc_MouldProdBackBillList", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
},
- //鍣ㄥ叿鐩存帴璋冩嫧鍗�
- {
- path: "/scMould/warehouse/Sc_MouldProdMoveBillEdit",
- component: Layout,
- hidden: true,
- redirect: "noredirect",
- meta: {
- breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
- activeMenu: "/scMould/warehouse/Sc_MouldProdMoveBillEdit", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ children: [
+ {
+ path: "/scMould/warehouse/Sc_MouldProdBackBillList",
+ component: () => import("@/views/scMould/warehouse/Sc_MouldProdBackBillList"),
+ name: "Sc_MouldProdBackBillList",
+ meta: { title: "鍣ㄥ叿棰嗙敤閫�搴撳崟缁存姢", activeMenu: "scMould/warehouse" },
},
- children: [
- {
- path: "/scMould/warehouse/Sc_MouldProdMoveBillEdit",
- component: () => import("@/views/scMould/warehouse/Sc_MouldProdMoveBillEdit"),
- name: "Sc_MouldProdMoveBillEdit",
- meta: { title: "鍣ㄥ叿鐩存帴璋冩嫧鍗曠紪杈�", activeMenu: "scMould/warehouse" },
- },
- ],
+ ],
+ },
+ //鍣ㄥ叿棰嗙敤閫�搴撳崟
+ {
+ path: "/scMould/warehouse/Sc_MouldProdBackBillEdit",
+ component: Layout,
+ hidden: true,
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/scMould/warehouse/Sc_MouldProdBackBillEdit", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
},
+ children: [
+ {
+ path: "/scMould/warehouse/Sc_MouldProdBackBillEdit",
+ component: () => import("@/views/scMould/warehouse/Sc_MouldProdBackBillEdit"),
+ name: "Sc_MouldProdBackBillEdit",
+ meta: { title: "鍣ㄥ叿棰嗙敤閫�搴撳崟缂栬緫", activeMenu: "scMould/warehouse" },
+ },
+ ],
+ },
+ //鍣ㄥ叿鐩存帴璋冩嫧鍗曠淮鎶�
+ {
+ path: "/scMould/warehouse/Sc_MouldProdMoveBillList",
+ component: Layout,
+ hidden: true,
+ // permissions: ["system:goods:add"],
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/scMould/warehouse/Sc_MouldProdMoveBillList", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ },
+ children: [
+ {
+ path: "/scMould/warehouse/Sc_MouldProdMoveBillList",
+ component: () => import("@/views/scMould/warehouse/Sc_MouldProdMoveBillList"),
+ name: "Sc_MouldProdMoveBillList",
+ meta: { title: "鍣ㄥ叿鐩存帴璋冩嫧鍗曠淮鎶�", activeMenu: "scMould/warehouse" },
+ },
+ ],
+ },
+ //鍣ㄥ叿鐩存帴璋冩嫧鍗�
+ {
+ path: "/scMould/warehouse/Sc_MouldProdMoveBillEdit",
+ component: Layout,
+ hidden: true,
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/scMould/warehouse/Sc_MouldProdMoveBillEdit", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ },
+ children: [
+ {
+ path: "/scMould/warehouse/Sc_MouldProdMoveBillEdit",
+ component: () => import("@/views/scMould/warehouse/Sc_MouldProdMoveBillEdit"),
+ name: "Sc_MouldProdMoveBillEdit",
+ meta: { title: "鍣ㄥ叿鐩存帴璋冩嫧鍗曠紪杈�", activeMenu: "scMould/warehouse" },
+ },
+ ],
+ },
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 966dea4..1fb42ea 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -613,6 +613,18 @@
name: "ScICMOBillList",
path: "scICMOBillList",
},
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "鐢熶骇璁㈠崟",
+ },
+ component: () => import("@/views/ICMO/ScICMOBillEdit.vue"),
+ hidden: false,
+ name: "ScICMOBillEdit",
+ path: "scICMOBillEdit",
+ },
],
},
],
diff --git a/src/views/ICMO/ScICMOBillEdit.vue b/src/views/ICMO/ScICMOBillEdit.vue
new file mode 100644
index 0000000..cc4a8f8
--- /dev/null
+++ b/src/views/ICMO/ScICMOBillEdit.vue
@@ -0,0 +1,1472 @@
+<template>
+ <div v-loading="formLoading" v-if="formShow" style="padding: 20px">
+ <div style="margin-bottom: 10px; border-bottom: 1px solid #f6f6f6">
+ <el-button type="primary" @click="handleAdd((OperationType = 1))" v-if="addBtnShow"
+ >鏂板</el-button
+ >
+ <el-button type="primary" @click="submitForm" :disabled="subDisabled"
+ >淇� 瀛�</el-button
+ >
+ <el-button type="primary" @click="set_CheckBill(0, form)">瀹� 鏍�</el-button>
+ <el-button type="primary" @click="close">閫� 鍑�</el-button>
+ <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
+ </div>
+ <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center">
+ 鐢熶骇璁㈠崟
+ </div>
+ <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <el-tabs v-model="activeName" type="card">
+ <el-tab-pane label="鍩烘湰淇℃伅" name="first">
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
+ <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹紪鍙�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鏃ユ湡" prop="HDate">
+ <el-date-picker
+ v-model="form.HDate"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ value-format="yyyy-MM-ddT"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="閿�鍞鍗曞彿" prop="HSeOrderBillNo" labelWidth="6em">
+ <el-input
+ v-model="form.HSeOrderBillNo"
+ placeholder="璇烽�夋嫨閿�鍞鍗�"
+ disabled
+ >
+ <el-button slot="append" icon="el-icon-search"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item
+ label="閿�鍞鍗曠被鍨�"
+ prop="HMainSourceBillSubType"
+ labelWidth="7em"
+ >
+ <el-select
+ v-model="form.HMainSourceBillSubType"
+ placeholder="璇烽�夋嫨閿�鍞鍗曠被鍨�"
+ >
+ <el-option
+ v-for="(item, index) in [
+ {
+ label: '鏅�氬崟鎹�',
+ value: 0,
+ },
+ {
+ label: '杩斾慨鍗曟嵁',
+ value: 1,
+ },
+ ]"
+ :key="index"
+ :label="item.label"
+ :value="item.value.toString()"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="涓氬姟鐘舵��" prop="HSTATUS">
+ <el-select v-model="form.HSTATUS" placeholder="璇烽�夋嫨涓氬姟鐘舵��">
+ <el-option
+ v-for="(item, index) in [
+ {
+ label: '璁″垝',
+ value: 1,
+ },
+ {
+ label: '璁″垝纭',
+ value: 2,
+ },
+ {
+ label: '涓嬭揪',
+ value: 3,
+ },
+ {
+ label: '寮�宸�',
+ value: 4,
+ },
+ {
+ label: '瀹屽伐',
+ value: 5,
+ },
+ {
+ label: '缁撴',
+ value: 6,
+ },
+ {
+ label: '缁撶畻',
+ value: 7,
+ },
+ ]"
+ :key="index"
+ :label="item.label"
+ :value="item.value.toString()"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="3">
+ <el-form-item
+ label="閿�鍞槸鍚﹀彇搴撳瓨"
+ prop="HIsStockQty_SeOrderBill"
+ labelWidth="8em"
+ >
+ <el-select
+ v-model="form.HIsStockQty_SeOrderBill"
+ placeholder="閿�鍞槸鍚﹀彇搴撳瓨"
+ >
+ <el-option
+ v-for="(item, index) in [
+ {
+ label: '鍚�',
+ value: 0,
+ },
+ {
+ label: '鏄�',
+ value: 1,
+ },
+ ]"
+ :key="index"
+ :label="item.label"
+ :value="item.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="3">
+ <el-form-item label="鐢熶骇鏄惁鍙栧簱瀛�" prop="HIsStockQty" labelWidth="8em">
+ <el-select v-model="form.HIsStockQty" placeholder="鐢熶骇鏄惁鍙栧簱瀛�">
+ <el-option
+ v-for="(item, index) in [
+ {
+ label: '鍚�',
+ value: 0,
+ },
+ {
+ label: '鏄�',
+ value: 1,
+ },
+ ]"
+ :key="index"
+ :label="item.label"
+ :value="item.value.toString()"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="3">
+ <el-form-item label="璁″垝鐢熶骇鏁伴噺" prop="HQty" labelWidth="7em">
+ <el-input v-model="form.HQty"> </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="7">
+ <el-form-item label="璁￠噺鍗曚綅" prop="HUnitName">
+ <el-input v-model="form.HUnitName" placeholder="璇烽�夋嫨璁￠噺鍗曚綅">
+ <el-button slot="append" icon="el-icon-search"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="7">
+ <el-form-item label="涓氬姟鍛�" prop="HEmpName">
+ <el-input v-model="form.HEmpName" placeholder="璇烽�夋嫨涓氬姟鍛�">
+ <el-button slot="append" icon="el-icon-search"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="瀹㈡埛" prop="HCusName">
+ <el-input v-model="form.HCusName" placeholder="璇烽�夋嫨瀹㈡埛">
+ <el-button slot="append" icon="el-icon-search"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鐗╂枡缂栫爜" prop="HMaterNumber">
+ <el-input
+ v-model="form.HMaterNumber"
+ disabled
+ placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�"
+ >
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鐗╂枡鍚嶇О" prop="HMaterName">
+ <el-input v-model="form.HMaterName" disabled></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="瑙勬牸鍨嬪彿" prop="HModel">
+ <el-input v-model="form.HModel" disabled> </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="骞呭" prop="HWidth">
+ <el-input v-model="form.HWidth" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍏嬮噸" prop="HWeight">
+ <el-input v-model="form.HWeight" disabled />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="3">
+ <el-form-item label="杈呮暟閲�" prop="HAuxQty">
+ <el-input v-model="form.HAuxQty" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="3">
+ <el-form-item label="杈呭姪鍗曚綅" prop="HAuxUnitName">
+ <el-input v-model="form.HAuxUnitName" disabled>
+ <template slot="append">
+ <el-button
+ type="primary"
+ icon="el-icon-search"
+ size="mini"
+ ></el-button>
+ </template>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鏌撹壊瑕佹眰" prop="HColorRemark">
+ <el-input v-model="form.HColorRemark" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鐢熶骇瑙勬牸" prop="HRemark_New">
+ <el-input v-model="form.HRemark_New" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鐢熶骇骞呭" prop="HWidth_New">
+ <el-input v-model="form.HWidth_New" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鐢熶骇鍏嬮噸" prop="HWeight_New">
+ <el-input v-model="form.HWeight_New" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="3">
+ <el-form-item label="杈呮暟閲�2" prop="HAuxQty2">
+ <el-input v-model="form.HAuxQty2" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="3">
+ <el-form-item label="杈呭姪鍗曚綅2" prop="HAuxUnitName2">
+ <el-input v-model="form.HAuxUnitName2">
+ <template slot="append">
+ <el-button
+ type="primary"
+ size="mini"
+ icon="el-icon-search"
+ ></el-button>
+ </template>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="瀹㈡埛鐗╂枡缂栫爜" prop="HCusMaterNumber" labelWidth="7em">
+ <el-input v-model="form.HCusMaterNumber" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="瀹㈡埛鐗╂枡鍚嶇О" prop="HCusMaterName" labelWidth="7em">
+ <el-input v-model="form.HCusMaterName" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="瀹㈡埛瑙勬牸鍨嬪彿" prop="HCusModel" labelWidth="7em">
+ <el-input v-model="form.HCusModel" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="璁″垝寮�宸ユ棩鏈�" prop="HPlanBeginDate" labelWidth="7em">
+ <el-date-picker
+ v-model="form.HPlanBeginDate"
+ type="date"
+ placeholder="閫夋嫨璁″垝寮�宸ユ棩鏈�"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="璁″垝瀹屽伐鏃ユ湡" prop="HPlanEndDate" labelWidth="7em">
+ <el-date-picker
+ v-model="form.HPlanEndDate"
+ type="date"
+ placeholder="閫夋嫨璁″垝瀹屽伐鏃ユ湡"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="16">
+ <el-form-item label="鐧藉澂瑕佹眰" prop="HRemark">
+ <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ唴瀹�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="缁勭粐" prop="HOrgID">
+ <el-select v-model="form.HOrgID">
+ <el-option
+ v-for="(item, index) in organizationList"
+ :key="index"
+ :label="item.label"
+ :value="item.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="16">
+ <el-form-item label="搴曢儴澶囨敞" prop="HRemark3">
+ <el-input v-model="form.HRemark3" placeholder="璇疯緭鍏ュ娉�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="璁㈠崟鍖呰澶囨敞" prop="HOrderPickRemark" labelWidth="7em">
+ <el-input
+ v-model="form.HOrderPickRemark"
+ placeholder="璇疯緭鍏ヨ鍗曞寘瑁呭娉�"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-tab-pane>
+ <el-tab-pane label="鍏朵粬淇℃伅" name="third">
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鍒跺崟浜�" prop="HMaker">
+ <el-input v-model="form.HMaker" placeholder="璇疯緭鍏ュ埗鍗曚汉" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="淇敼浜�" prop="HUpDater">
+ <el-input v-model="form.HUpDater" placeholder="璇疯緭鍏ヤ慨鏀逛汉" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="瀹℃牳浜�" prop="HChecker">
+ <el-input v-model="form.HChecker" placeholder="璇疯緭鍏ュ鏍镐汉" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍏抽棴浜�" prop="HCloseMan">
+ <el-input v-model="form.HCloseMan" placeholder="璇疯緭鍏ュ叧闂汉" disabled />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鍒跺崟鏃ユ湡" prop="HMakeDate">
+ <el-date-picker
+ v-model="form.HMakeDate"
+ type="date"
+ placeholder="閫夋嫨鍒跺崟鏃ユ湡"
+ disabled
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="淇敼鏃ユ湡" prop="HUpDateDate">
+ <el-date-picker
+ v-model="form.HUpDateDate"
+ type="date"
+ placeholder="閫夋嫨瀹℃牳鏃ユ湡"
+ disabled
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="瀹℃牳鏃ユ湡" prop="HCheckDate">
+ <el-date-picker
+ v-model="form.HCheckDate"
+ type="date"
+ placeholder="閫夋嫨瀹℃牳鏃ユ湡"
+ disabled
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍏抽棴鏃ユ湡" prop="HCloseDate">
+ <el-date-picker
+ v-model="form.HCloseDate"
+ type="date"
+ placeholder="閫夋嫨鍏抽棴鏃ユ湡"
+ disabled
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="浣滃簾浜�" prop="HDeleteMan">
+ <el-input v-model="form.HDeleteMan" placeholder="璇疯緭鍏ヤ綔搴熶汉" disabled />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="浣滃簾鏃ユ湡" prop="HDeleteDate">
+ <el-date-picker
+ v-model="form.HDeleteDate"
+ type="date"
+ placeholder="閫夋嫨浣滃簾鏃ユ湡"
+ disabled
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="宸ヤ綔涓績" prop="HCenterName">
+ <el-input
+ v-model="form.HCenterName"
+ placeholder="璇烽�夋嫨宸ヤ綔涓績"
+ disabled
+ >
+ <template slot="append">
+ <el-button type="primary" icon="el-icon-search"></el-button>
+ </template>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="BOM" prop="HBomName">
+ <el-input v-model="form.HBomName" placeholder="璇烽�夋嫨鐗╂枡娓呭崟" disabled>
+ <template slot="append">
+ <el-button type="primary" icon="el-icon-search"></el-button>
+ </template>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鏈�杩熷紑宸ユ棩鏈�" prop="HBeginDate" labelWidth="7em">
+ <el-date-picker
+ v-model="form.HBeginDate"
+ type="date"
+ placeholder="閫夋嫨鏈�杩熷紑宸ユ棩鏈�"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鏈�杩熷畬宸ユ棩鏈�" prop="HEndDate" labelWidth="7em">
+ <el-date-picker
+ v-model="form.HEndDate"
+ type="date"
+ placeholder="閫夋嫨鏈�杩熷畬宸ユ棩鏈�"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鐢熶骇杞﹂棿" prop="HDeptName">
+ <el-input v-model="form.HDeptName" placeholder="璇烽�夋嫨鐢熶骇杞﹂棿" disabled>
+ <template slot="append">
+ <el-button type="primary" icon="el-icon-search"></el-button>
+ </template>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="璁㈠崟璺熻釜鍙�" prop="HPlanOrderProcNo" labelWidth="6em">
+ <el-input v-model="form.HPlanOrderProcNo" placeholder="璇疯緭鍏ヨ鍗曡窡韪彿">
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-tab-pane>
+ </el-tabs>
+ </el-form>
+ <!-- 閮ㄩ棬寮圭獥 -->
+ <el-dialog
+ :title="dialogTitle"
+ :visible.sync="openData"
+ width="1280px"
+ append-to-body
+ >
+ <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
+ <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="warehouseShow" />
+ <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="materialShow" />
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
+ <el-button @click="deptClose">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
+ <el-dialog
+ title="闅愯棌鍒楄缃�"
+ :visible.sync="openRowHide"
+ width="816px"
+ append-to-body
+ >
+ <RowSettings
+ :colName="btResList"
+ HModName="Kf_SellOutBillList"
+ @rowEditClose="rowSetClose"
+ v-if="rowHideShow"
+ />
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+import axios from "axios";
+import Dept from "@/views/component/dept";
+import Warehouse from "@/views/component/warehouse";
+import Material from "@/views/component/material";
+import RowSettings from "@/views/component/rowSettings";
+import moment from "moment";
+import dayjs from "dayjs";
+
+export default {
+ name: "SellOutBill",
+ components: { Dept, Warehouse, Material, RowSettings },
+ props: {
+ OperationType: { type: Number },
+ linterid: { type: Number },
+ HSouceBillType: { type: String },
+ propsData: { type: String },
+ copyType: { type: Number },
+ },
+ data() {
+ return {
+ OperationType2: 1,
+ HInterID2: 0,
+ HEntryID: 1,
+ formShow: false,
+ temp: undefined,
+ formLoading: true,
+ zzSelDis: false,
+ rowHideShow: false,
+ openRowHide: false,
+ hPriceTypeList: ["鎴愭湰浠�", "缁撶畻浠�"],
+ addBtnShow: false,
+ zbIndex: null,
+ zbSelForm: {}, //瀛愯〃閫変腑鏁版嵁
+ dialogTypeNum: null, //閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
+ deptShow: false, //閮ㄩ棬鏁版嵁缁勪欢
+ warehouseShow: false, //浠撳簱鏁版嵁缁勪欢
+ materialShow: false, //鐗╂枡鏁版嵁缁勪欢
+ deptform: {}, //寮圭獥閫変腑鏁版嵁
+ openData: false, //鏁版嵁寮圭獥
+ dialogTitle: "",
+ organizationList: [], //缁勭粐鍒楄〃
+ subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
+ // OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+ HInterID: null,
+ baseURL: process.env.VUE_APP_BASE_API,
+ checkedSysZb: [],
+ editData: [], //閿�鍞嚭搴撳崟瀛愯〃
+ editBtData: [], //瀛愯〃琛ㄥご
+ activeName: "first",
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ open: false,
+ // 鏃ユ湡鑼冨洿
+ dateRange: [],
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ HBillNo: "",
+ HInitTimeCycle: 29,
+ HProjectNumber: "",
+ HCusID: null,
+ HMaterNumber: "",
+ HMaterName: "",
+ ColName1: "",
+ ColName2: "",
+ ColName: "",
+ Comparator1: "",
+ Comparator2: "",
+ Comparator: "",
+ ColContent1: "",
+ ColContent2: "",
+ ColContent: "",
+ },
+ // 鏄剧ず鎼滅储鏉′欢
+ showSearch: true,
+ // 閫変腑鏁扮粍
+ ids: [],
+ // 闈炲崟涓鐢�
+ single: true,
+ // 闈炲涓鐢�
+ multiple: true,
+ // 閬僵灞�
+ loading: true,
+ btResList: [],
+ // 琛ㄥ崟鍙傛暟
+ form: {},
+ // 琛ㄥ崟鏍￠獙
+ rules: {
+ HSupName: [{ required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }],
+ HDate: [{ required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }],
+ HExRate: [{ required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }],
+ },
+ };
+ },
+ created() {
+ this.fetchData();
+ this.getdata();
+ },
+ beforeDestroy() {
+ if (window.parent) {
+ } else {
+ this.$destroy();
+ }
+ },
+ methods: {
+ fetchData() {
+ axios
+ .get(this.baseURL + "/Web/GetOrganizations", {})
+ .then((response) => {
+ if (response.data.count == 1) {
+ this.organizationList = response.data.data.map((item) => {
+ return {
+ label: item.Name,
+ value: item.ID,
+ };
+ }); //缁勭粐鍒楄〃
+ }
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ getdata() {
+ this.HInterID2 = this.$route.query.HInterID || this.linterid || 0;
+ this.OperationType2 = this.$route.query.OperationType || this.OperationType || 1;
+ this.HEntryID = this.$route.query.HEntryID || 1;
+ this.formShow = false;
+ this.formLoading = true;
+
+ if (this.OperationType2 == 4) {
+ this.zzSelDis = true;
+ this.handleAdd();
+ var data = [{ hmainid: this.HInterID2 }];
+ var dataArray = [];
+ for (var i = 0; i < data.length; i++) {
+ // this.getPushSourceBillInit(data[i].hmainid, data[i].hsubid);
+ axios
+ .get(this.baseURL + "/Xs_SeOutStockBill/cx", {
+ params: {
+ HInterID: data[i].hmainid,
+ },
+ })
+ .then((response) => {
+ let result = response.data;
+ if (result.code == 1) {
+ // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ this.temp = result.data[0];
+ } else {
+ this.temp = result.data;
+ }
+ if (this.temp) {
+ dataArray.push(this.temp);
+ this.form.HDeptID = dataArray[0].HDeptID;
+ this.form.HDeptName = dataArray[0].閮ㄩ棬;
+ this.form.HEmpID = dataArray[0].HEmpID;
+ this.form.HEmpName = dataArray[0].涓氬姟鍛�;
+ this.form.HManagerID = dataArray[0].HManagerID;
+ this.form.HManagerName = dataArray[0].涓荤;
+ this.form.HMainSourceInterID = "0";
+ this.form.HMainSourceEntryID = "0";
+ this.form.HMainSourceBillNo = "";
+ this.form.HMainSourceBillType = dataArray[0].HBillType;
+ this.form.HSupID = dataArray[0].HCusID;
+ this.form.HSupName = dataArray[0].瀹㈡埛;
+ this.form.HLinkMan = dataArray[0].鑱旂郴浜�;
+ this.form.HLinkPhone = dataArray[0].鑱旂郴鐢佃瘽;
+ this.form.HSellSID = dataArray[0].HSellSID;
+ this.form.HSellSName = dataArray[0].閿�鍞柟寮�;
+ this.form.HCurID = dataArray[0].HCurID;
+ this.form.HCurName = dataArray[0].甯佸埆;
+ this.form.HExRate = dataArray[0].姹囩巼;
+ for (var i = 0; i < dataArray.length; i++) {
+ this.editData.push({
+ HMaterID: dataArray[i].HMaterID,
+ 鐗╂枡浠ｇ爜: dataArray[i].鐗╂枡浠ｇ爜,
+ 鐗╂枡鍚嶇О: dataArray[i].鐗╂枡鍚嶇О,
+ 瑙勬牸鍨嬪彿: dataArray[i].瑙勬牸鍨嬪彿,
+ HUnitID: dataArray[i].HUnitID,
+ 璁￠噺鍗曚綅: dataArray[i].璁￠噺鍗曚綅,
+ HQtyMust: dataArray[i].鏁伴噺.toFixed(6),
+ HQty: dataArray[i].鏁伴噺.toFixed(6),
+ HPieceQty: "0",
+ HPrice: dataArray[i].鍗曚环.toFixed(4),
+ HTaxPrice: dataArray[i].瀹為檯鍚◣鍗曚环.toFixed(4),
+ HTaxRate: dataArray[i].绋庣巼,
+ HMoney: dataArray[i].閲戦.toFixed(2),
+ HTaxMoney: dataArray[i].浠风◣鍚堣.toFixed(2),
+ HWHID: dataArray[i].HWHID,
+ 鍙戣揣浠撳簱: dataArray[i].HWHName,
+ HRemark: "",
+ HQty_Full: "0",
+ HQty_Empty: "0",
+ HQty_Back: "0",
+ HCostPrice: "0",
+ HCostMoney: "0",
+ HSalePrice: "0",
+ HSeOrderInterID: dataArray[i].hmainid,
+ HSeOrderEntryID: dataArray[i].hsubid,
+ HSeOrderBillNo: dataArray[i].鍗曟嵁鍙�,
+ HSourceInterID: dataArray[i].hmainid,
+ HSourceEntryID: dataArray[i].hsubid,
+ HSourceBillNo: dataArray[i].鍗曟嵁鍙�,
+ HSourceBillType: dataArray[i].HBillType,
+ HRelationQty: "0",
+ HRelationMoney: "0",
+ HSPID: "0",
+ HSPName: "",
+ HSPGroupID: "0",
+ HSPGroupName: "",
+ HSCWHID: "0",
+ HSCWHName: "",
+ HSCSPID: "0",
+ HSCSPName: "",
+ HBatchNo: "",
+ HPOOrderInterID: "0",
+ HPOOrderEntryID: "0",
+ HPOOrderBillNo: "",
+ HPropertyID: "0",
+ HPropertyName: "",
+ HSecUnitID: "0",
+ HSecUnitName: "",
+ HSecUnitRate: "0",
+ HEngineNum: "",
+ HUnderPanNum: "",
+ HLeaveFactCard: "",
+ HReqBuyQty: "0",
+ HReqOutQty: "0",
+ HCurrentInventory: "0",
+ });
+ }
+ }
+ this.$nextTick(() => {
+ this.formShow = true;
+ this.formLoading = false;
+ });
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ }
+ } else if (this.OperationType2 == 1 || !this.OperationType2) {
+ this.handleAdd();
+ } else if (this.OperationType2 == 3) {
+ this.handleUpdate();
+ }
+ },
+ // 鑾峰彇鍙傛暟_浼犻�掔殑JSON鏍煎紡鍙傛暟
+ getUrlVars_JSON() {
+ var datajson;
+ var str = this.propsData; //鑾峰彇閾炬帴涓紶閫掔殑鍙傛暟
+ var arr = str.substring(str.lastIndexOf("=") + 1);
+ datajson = JSON.parse(decodeURI(arr));
+ return datajson;
+ },
+ //鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢攢鍞鍗曟暟鎹�
+ getPushSourceBillInit(HSourceInterID, HSourceEntryID) {
+ axios
+ .get(this.baseURL + "/Xs_SeOrderBill/loadXs_SeOrderBill_Push", {
+ params: {
+ HInterID: HSourceInterID,
+ HSubID: HSourceEntryID,
+ },
+ })
+ .then((response) => {
+ let result = response.data;
+ if (result.code == 1) {
+ // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ this.temp = result.data[0];
+ } else {
+ this.temp = result.data;
+ }
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ handleRowHide() {
+ this.rowHideShow = true;
+ this.openRowHide = true;
+ },
+ rowSetClose(val) {
+ this.rowHideShow = false;
+ this.openRowHide = val;
+ this.$destroy();
+ },
+
+ organizationChange(val) {
+ // let options=undefined
+ // this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
+ },
+ //閮ㄩ棬寮圭獥璧嬪��
+ dbEmitData(deptRow, num) {
+ // num=1閮ㄩ棬 num=2鍑哄簱浠撳簱
+ if (num == 1) {
+ this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О;
+ this.form.HDeptID = deptRow.HItemID;
+ this.form.HEmpID = deptRow.HEmpID;
+ this.form.HManagerName = deptRow.璐熻矗浜�;
+ this.openData = false;
+ } else if (num == 2) {
+ this.editData[this.zbIndex].HWHID = deptRow.HItemID;
+ this.editData[this.zbIndex].鍙戣揣浠撳簱 = deptRow.浠撳簱鍚嶇О;
+ this.openData = false;
+ } else if (num == 3) {
+ this.editData[this.zbIndex].HMaterID = deptRow.HItemID;
+ this.editData[this.zbIndex].鐗╂枡浠ｇ爜 = deptRow.鐗╂枡浠ｇ爜;
+ this.editData[this.zbIndex].鐗╂枡鍚嶇О = deptRow.鐗╂枡鍚嶇О;
+ this.editData[this.zbIndex].HUnitID = deptRow.HUnitID;
+ this.editData[this.zbIndex].瑙勬牸鍨嬪彿 = deptRow.瑙勬牸鍨嬪彿;
+ this.editData[this.zbIndex].璁￠噺鍗曚綅 = deptRow.璁￠噺鍗曚綅鍚嶇О;
+ this.editData[this.zbIndex].HTaxPrice = deptRow.鍚◣鎴愭湰浠�;
+ this.editData[this.zbIndex].HTaxRate = deptRow.榛樿绋庣巼;
+ this.openData = false;
+ }
+ },
+ emitData(deptRow, num) {
+ this.dialogTypeNum = num;
+ this.deptform = deptRow;
+ },
+ deptClickSub() {
+ this.dbEmitData(this.deptform, this.dialogTypeNum);
+ this.deptform = {};
+ },
+ deptClose() {
+ this.deptform = {};
+ this.openData = false;
+ },
+
+ //閲囪喘璁㈠崟鏂板缂栬緫琛ㄥ崟鍒濆鍖�
+ reset() {
+ this.form = {
+ BillType: "1102",
+ HBillNo: "",
+ HInterID: "",
+ HBillSubType: "0",
+ HDate: new Date(),
+ HMainSourceInterID: 0,
+ HMainSourceEntryID: 0,
+ HMainSourceBillType: "",
+ HMainSourceBillNo: "",
+ HEmpName: "",
+ HEmpID: 0,
+ HDeptName: "",
+ HDeptID: 0,
+ HManagerName: "",
+ HManagerID: 0,
+ HSupName: sessionStorage["HSupName"],
+ HSupID: sessionStorage["HSupID"],
+ HLinkMan: "",
+ HLinkPhone: "",
+ HSecManagerName: "",
+ HSecManagerID: 0,
+ HKeeperName: "",
+ HKeeperID: 0,
+ HRemark: "",
+ HProjectNumber: "",
+ HProjectID: 0,
+ HProjectName: "",
+ HGroupName: "",
+ HGroupID: 0,
+ HWHName: "",
+ HWHID: 0,
+ HConveyCompName: "",
+ HConveyCompID: 0,
+ HConveyTypeName: "",
+ HConveyTypeID: 0,
+ HConveyMoney: "0",
+ HCarriage: "0",
+ HSTOCKORGID: sessionStorage["OrganizationID"] - 0, //缁勭粐id
+ HOWNERID: sessionStorage["OrganizationID"] - 0,
+ HSCWHName: "",
+ HSCWHID: 0,
+ HCheckStatusMan: "",
+ HExplanation: "",
+ HInnerBillNo: "",
+ HCurName: "浜烘皯甯�",
+ HCurID: 1,
+ HExRate: "1",
+ HSellSName: "",
+ HSellSID: 0,
+ HCusBalance: "0",
+ HCreditRating_Now: "0",
+ HAvailableBalance: "0",
+ HPriceType: "鎴愭湰浠�",
+ HOrgID: sessionStorage["OrganizationID"] - 0,
+ HMaker: "",
+ HUpDater: "",
+ HChecker: "",
+ HMakeDate: new Date(),
+ HUpDateDate: "",
+ HCheckDate: "",
+ HCloseMan: "",
+ HDeleteMan: "",
+ HCloseDate: "",
+ HDeleteDate: "",
+ };
+ this.editData = [];
+ this.editBtData = [];
+ this.ids = [];
+ this.subDisabled = false;
+ this.addBtnShow = false;
+ // this.$refs.tableData.clearSelection()
+ this.activeName = "first";
+ this.resetForm("form");
+ },
+ //閫�鍑�
+ close() {
+ this.reset();
+ if (window.self != window.top) {
+ window.parent.editGyClose;
+ } else if (!this.OperationType2 && !this.copyType) {
+ // this.$router.back()
+ window.close();
+ } else {
+ this.formShow = false;
+ this.$emit("editClose", false);
+ }
+ },
+ //鏍规嵁鐢ㄦ埛鑾峰彇瀵瑰簲鑱屽憳銆侀儴闂ㄣ�侀攢鍞富绠�
+ getCzyglByUser() {
+ axios
+ .get(this.baseURL + "/Xs_SeOrderBill/getCzyglByUser", {
+ params: { CurUserName: sessionStorage["HUserName"] },
+ })
+ .then((response) => {
+ let dataForm = response.data.data[0];
+ this.form.HDeptID = dataForm.HDeptID;
+ this.form.HDeptName = dataForm.HDeptName;
+ this.form.HEmpID = dataForm.HEmpID;
+ this.form.HEmpName = dataForm.HEmpName;
+ this.form.HManagerID = dataForm.HManagerID;
+ this.form.HManagerName = dataForm.HManagerName;
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ /** 鏂板鎸夐挳鎿嶄綔 */
+ handleAdd() {
+ this.reset();
+ //鏂板鑾峰彇鍗曟嵁鍙�
+ this.getHBillNo();
+ let date = new Date();
+ this.form.HDate = moment(date).format("YYYY-MM-DDTHH:mm:ss");
+ if (this.OperationType2 == 1) {
+ this.handleAddSysZb();
+ }
+ this.$nextTick(() => {
+ this.formShow = true;
+ this.formLoading = false;
+ });
+ },
+ getHBillNo() {
+ axios
+ .get(this.baseURL + "/WEBSController/GetMaxBillNoAndID_Json", {
+ params: {
+ HBillType: "3710",
+ },
+ })
+ .then((response) => {
+ this.form.HMaker = sessionStorage["HUserName"];
+ this.form.HBillNo = response.data.data[0].HBillNo;
+ this.form.HInterID = response.data.data[0].HInterID;
+ // this.copyType = 0
+ // this.getCzyglByUser()
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //鑾峰彇閿�鍞嚭搴撳崟瀵瑰簲鐨勬潯鐮佹槑缁�
+ getBarCodeNoteBySellOutBill(rowHmainid) {
+ axios
+ .get(this.baseURL + "/Kf_SellOutBill/BarCodeNote", {
+ params: { HInterID: rowHmainid },
+ })
+ .then((response) => {
+ if (response.data.count == 1) {
+ if (response.data.data[2].length > 0) {
+ this.$modal.msgError("褰撳墠鍗曟嵁鐢辨壂鐮佺敓鎴愶紝涓嶅彲浠ョ紪杈戯紒");
+ this.subDisabled = true;
+ }
+ } else {
+ }
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#region 鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛浣欓
+ getCustomerBalance(HCusID) {
+ axios
+ .get(this.baseURL + "/Xs_CusRatingChangeBill/getCustomerBalance", {
+ params: { HCusID: HCusID, CurUserName: sessionStorage["HUserName"] },
+ })
+ .then((response) => {
+ var data = response.data.data[0];
+ this.form.HCusBalance = data.HCusBalance;
+ this.form.HCreditRating_Now = data.HCreditRating_Now;
+ this.form.HAvailableBalance = data.HAvailableBalance;
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ /** 淇敼鎸夐挳鎿嶄綔 */
+ handleUpdate() {
+ this.reset();
+ let sWhere =
+ " and HPRDORGID=" +
+ sessionStorage["OrganizationID"] +
+ " and hmainid='" +
+ this.HInterID2 +
+ "' and HEntryID=" +
+ this.HEntryID;
+
+ axios
+ .get(this.baseURL + "/LEMS/MES_IF_ICMOBillList_Json", {
+ params: { sWhere: sWhere, user: sessionStorage["HUserName"] },
+ })
+ .then((response) => {
+ if (response.data.count == 1) {
+ let result = response.data;
+ let data = response.data.data;
+ switch (data[0]["鐘舵��"]) {
+ case "璁″垝":
+ this.form.HSTATUS = "1";
+ break;
+ case "璁″垝纭":
+ this.form.HSTATUS = "2";
+ break;
+ case "涓嬭揪":
+ this.form.HSTATUS = "3";
+ break;
+ case "寮�宸�":
+ this.form.HSTATUS = "4";
+ break;
+ case "瀹屽伐":
+ this.form.HSTATUS = "5";
+ break;
+ case "缁撴":
+ this.form.HSTATUS = "6";
+ break;
+ }
+
+ // this.form.BillType = data.HSourceBillType;
+ Object.assign(this.form, {
+ HBillNo: data[0].鍗曟嵁鍙�,
+ HInterID: data[0].hmainid,
+ HPRDORGID: data[0].HPRDORGID,
+ HDate: dayjs(new Date(data[0].鏃ユ湡)).format("YYYY-MM-DD"),
+ HSeOrderBillNo: data[0].婧愬崟鍗曞彿,
+ HSeOrderInterID: data[0].婧愬崟涓诲唴鐮�,
+ HSeOrderEntryID: data[0].婧愬崟瀛愬唴鐮�,
+ HMainSourceBillSubType: data[0].HMainSourceBillSubType,
+
+ HSourceInterID: data[0].HSourceInterID,
+ HSourceEntryID: data[0].HSourceEntryID,
+ HSourceBillNo: data[0].HSourceBillNo,
+ HSourceBillType: data[0].HSourceBillType,
+ HEmpID: data[0].HEmpID,
+ HEmpName: data[0].涓氬姟鍛�,
+ HCusID: data[0].HEntryCusID,
+ HCusName: data[0].瀹㈡埛,
+ HCenterID: data[0].HCenterID,
+ HCenterName: data[0].宸ヤ綔涓績,
+ HDeptID: data[0].HDeptID,
+ HDeptName: data[0].鐢熶骇杞﹂棿,
+ HQty: data[0].鐢熶骇浠诲姟鍗曟暟閲�,
+ HMaterID: data[0].HMaterID,
+ HMaterNumber: data[0].浜у搧浠ｇ爜,
+ HMaterName: data[0].浜у搧鍚嶇О,
+ HModel: data[0].瑙勬牸鍨嬪彿,
+ HSourceID: data[0].HSourceID_b,
+ HSourceName: data[0].HsourceName,
+ HUnitID: data[0].HUnitID,
+ HUnitName: data[0].璁￠噺鍗曚綅,
+ HIsStockQty: data[0].HIsStockQty,
+ HIsStockQty_SeOrderBill: data[0].HIsStockQty_SeOrderBill ? 1 : 0,
+ HBomID: data[0].HBomID,
+ HBomName: data[0].BOM鍗曠紪鐮�,
+ HPlanBeginDate: dayjs(new Date(data[0].璁″垝寮�宸ユ棩鏈�)).format("YYYY-MM-DD"),
+ HPlanEndDate: dayjs(new Date(data[0].璁″垝瀹屽伐鏃ユ湡)).format("YYYY-MM-DD"),
+ HBeginDate: dayjs(new Date(data[0].鏈�杩熷紑宸ユ棩鏈�)).format("YYYY-MM-DD"),
+ HEndDate: dayjs(new Date(data[0].鏈�杩熷畬宸ユ棩鏈�)).format("YYYY-MM-DD"),
+ HRemark: data[0].琛ㄥご澶囨敞,
+ HRemark3: data[0].搴曢儴澶囨敞,
+ HAuxQty: data[0].HAuxQty,
+ HAuxUnit: data[0].HAuxUnit,
+ HAuxUnitName: data[0].HAuxUnitName,
+
+ HAuxQty2: data[0].HAuxQty2,
+ HAuxUnit2: data[0].HAuxUnit2,
+ HAuxUnitName2: data[0].HAuxUnitName2,
+
+ HWidth: data[0].HWidth,
+ HWeight: data[0].HWeight,
+ HColorRemark: data[0].鏌撹壊瑕佹眰,
+ HCusMaterName: data[0].瀹㈡埛鐗╂枡鍚嶇О,
+ HCusModel: data[0].瀹㈡埛瑙勬牸鍨嬪彿,
+ HCusMaterNumber: data[0].瀹㈡埛鐗╂枡缂栫爜,
+ HOrderPickRemark: data[0].璁㈠崟鍖呰澶囨敞,
+ HWidth_New: data[0].鐢熶骇骞呭,
+ HWeight_New: data[0].鐢熶骇鍏嬮噸,
+ HRemark_New: data[0].鐢熶骇瑙勬牸,
+ //鍏朵粬淇℃伅
+ hmakers: this.OperationType2 == 2 ? "" : data[0].鍒跺崟浜�,
+ hmakedate:
+ this.OperationType2 == 2
+ ? ""
+ : data[0].鍒跺崟鏃ユ湡 == null
+ ? ""
+ : dayjs(new Date(data[0].鍒跺崟鏃ユ湡)).format("YYYY-MM-DD"),
+ hchecker: this.OperationType2 == 2 ? "" : data[0].瀹℃牳浜�,
+ hcheckdate:
+ this.OperationType2 == 2
+ ? ""
+ : data[0].瀹℃牳鏃ユ湡 == null
+ ? ""
+ : dayjs(new Date(data[0].瀹℃牳鏃ユ湡)).format("YYYY-MM-DD"),
+ hupdater: this.OperationType2 == 2 ? "" : data[0].淇敼浜�,
+ hupdatedate:
+ this.OperationType2 == 2
+ ? ""
+ : data[0].淇敼鏃ユ湡 == null
+ ? ""
+ : dayjs(new Date(data[0].淇敼鏃ユ湡)).format("YYYY-MM-DD"),
+ hdeleteman: this.OperationType2 == 2 ? "" : data[0].浣滃簾浜�,
+ hdeletedate:
+ this.OperationType2 == 2
+ ? ""
+ : data[0].浣滃簾鏃ユ湡 == null
+ ? ""
+ : dayjs(new Date(data[0].浣滃簾鏃ユ湡)).format("YYYY-MM-DD"),
+ HPlanOrderProcNo: data[0].HPlanOrderProcNo,
+ });
+ if (this.copyType == 1) {
+ this.getHBillNo();
+ let date = new Date();
+ this.form.HDate = moment(date).format("YYYY-MM-DDTHH:mm:ss");
+ }
+ this.formShow = true;
+ this.formLoading = false;
+ }
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触! ");
+ console.error(error);
+ });
+ },
+ //鏍规嵁瀹㈡埛甯﹀嚭鑱旂郴浜恒�佽仈绯荤數璇�
+ getCustomerByCusID(HCusID) {
+ axios
+ .get(this.baseURL + "/Xs_SeOrderBill/getCustomerByCusID", {
+ params: {
+ HCusID: HCusID,
+ },
+ })
+ .then((response) => {
+ this.form.鑱旂郴浜� = response.data.data[0].HLinkMan;
+ this.form.鑱旂郴鐢佃瘽 = response.data.data[0].HLinkPhone;
+ // this.form = response.data.data[0]
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ /** 閿�鍞嚭搴撳瓙琛ㄦ槑缁嗗簭鍙� */
+ rowSysZbIndex({ row, rowIndex }) {
+ row.index = rowIndex + 1;
+ },
+ /** 缂栬緫椤靛瓙琛ㄦ坊鍔犳寜閽搷浣� */
+ handleAddSysZb(index, num) {
+ if (num == 1 && !index) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
+ } else {
+ let obj = {
+ HMaterID: 0,
+ 鐗╂枡浠ｇ爜: "",
+ 鐗╂枡鍚嶇О: "",
+ 瑙勬牸鍨嬪彿: "",
+ HUnitID: 0,
+ 璁￠噺鍗曚綅: "",
+ HQtyMust: 1,
+ HQty: 1,
+ HPieceQty: 0,
+ HPrice: 0,
+ HTaxPrice: 0,
+ HTaxRate: 0,
+ HMoney: 0,
+ HTaxMoney: 0,
+ HWHID: 0,
+ 鍙戣揣浠撳簱: "",
+ HRemark: "",
+ HQty_Full: 0,
+ HQty_Empty: 0,
+ HQty_Back: 0,
+ HCostPrice: 0,
+ HCostMoney: 0,
+ HSalePrice: 0,
+ HSeOrderInterID: 741,
+ HSeOrderEntryID: 18,
+ HSeOrderBillNo: "XSFH00000747",
+ HSourceInterID: 741,
+ HSourceEntryID: 18,
+ HSourceBillNo: "XSFH00000747",
+ HSourceBillType: 1402,
+ HRelationQty: 0,
+ HRelationMoney: 0,
+ HSPID: 0,
+ HSPName: "",
+ HSPGroupID: 0,
+ HSPGroupName: "",
+ HSCWHID: 0,
+ HSCWHName: "",
+ HSCSPID: 0,
+ HSCSPName: "",
+ HBatchNo: "",
+ HPOOrderInterID: 0,
+ HPOOrderEntryID: 0,
+ HPOOrderBillNo: "",
+ HPropertyID: 0,
+ HPropertyName: "",
+ HSecUnitID: 0,
+ HSecUnitName: "",
+ HSecUnitRate: 0,
+ HEngineNum: "",
+ HUnderPanNum: "",
+ HLeaveFactCard: "",
+ HReqBuyQty: 0,
+ HReqOutQty: 0,
+ HCurrentInventory: 0,
+ };
+ if (index) {
+ this.editData.splice(index, 0, obj);
+ this.$set(this.editData, index, obj);
+ } else {
+ this.editData.push(obj);
+ }
+ }
+ },
+ handleCopyZbRow() {
+ if (!this.zbIndex) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�");
+ } else {
+ let copyRow = JSON.parse(JSON.stringify(this.zbSelForm));
+ this.editData.push(copyRow);
+ }
+ },
+ handleMoveRowUp(zbSelForm) {
+ if (!this.zbIndex) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�");
+ } else {
+ if (zbSelForm.index == 1) {
+ this.$modal.msgError("绗竴琛屾暟鎹棤娉曚笂绉�");
+ } else {
+ // 纭繚涓嶆槸绗竴琛�
+ let num = zbSelForm.index - 1;
+ const record = this.editData.splice(num, 1)[0];
+ this.editData.splice(num - 1, 0, record);
+ }
+ }
+ },
+ handleMoveRowDown(zbSelForm) {
+ if (!this.zbIndex) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�");
+ } else {
+ if (zbSelForm.index == this.editData.length) {
+ this.$modal.msgError("鏈�鍚庝竴琛屾暟鎹棤娉曚笅绉�");
+ } else {
+ // 纭繚涓嶆槸绗竴琛�
+ let num = zbSelForm.index - 1;
+ const record = this.editData.splice(num, 1)[0];
+ this.editData.splice(num + 1, 0, record);
+ }
+ }
+ },
+ /** 缂栬緫椤靛瓙琛ㄥ垹闄ゆ寜閽搷浣� */
+ handleDeleteSysZb(row) {
+ this.checkedSysZb = [];
+ this.checkedSysZb.push(row.index);
+ if (this.checkedSysZb.length == 0) {
+ this.$modal.msgError("璇峰厛閫夋嫨瑕佸垹闄ょ殑鍟嗗搧璁㈠崟鏄庣粏鏁版嵁");
+ } else {
+ const editData = this.editData;
+ const checkedSysZb = this.checkedSysZb;
+ this.editData = editData.filter(function (item) {
+ return checkedSysZb.indexOf(item.index) == -1;
+ });
+ }
+ },
+ /** 缂栬緫椤靛瓙琛ㄥ閫夋閫変腑鏁版嵁 */
+ handleTableZbEdit(selection) {
+ this.checkedSysZb = selection.map((item) => item.index);
+ this.zbSelForm = selection[0];
+ this.zbIndex = this.checkedSysZb[0];
+ if (selection.length > 1) {
+ const del_row = selection.shift();
+ this.$refs.zbTable.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
+ }
+ },
+ //鑾峰彇鏈�澶у崟鎹彿_浠诲姟绫伙紙Type涓�0鏃跺彧鑾峰彇涓嶆柊澧炴祦姘村彿锛屼负1鏃舵柊澧炰笖鑾峰彇娴佹按鍙凤級
+ get_MAXNum_Task(Type) {
+ var sql = `exec h_p_Xt_GetMaxBillNo_SubType '1205','${this.form.HDate}',0,0,0,'${Type}','${this.form.HDeptID}'`;
+ axios({
+ method: "get",
+ url: this.baseURL + "/CommonModel/searchMethod",
+ params: { sql: sql, user: sessionStorage["HUserName"], ModRightNameCheck: "" },
+ })
+ .then((response) => {
+ if (response.data.count == 1) {
+ this.form.HBillNo = response.data.data[0].HBillNo;
+ } else {
+ this.$modal.msgError(response.data.code + response.data.Message);
+ }
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ // 缂栬緫鎻愪氦淇濆瓨
+ submitForm() {
+ this.$refs["form"].validate((valid) => {
+ if (valid) {
+ let fhck = false;
+ this.editData.map((item, index) => {
+ if (!item.鍙戣揣浠撳簱) {
+ fhck = true;
+ this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍙戣揣浠撳簱鏈�夋嫨锛�");
+ }
+ });
+ this.$nextTick(() => {
+ if (!fhck) {
+ var sMainStr = JSON.stringify(this.form);
+ var sSubStr = JSON.stringify(this.editData);
+ var sMainSub =
+ sMainStr +
+ ";" +
+ sSubStr +
+ ";" +
+ sessionStorage["HUserName"] +
+ ";" +
+ this.OperationType2;
+ axios({
+ method: "post",
+ url: this.baseURL + "/Kf_SellOutBill/SaveSellOutBillList",
+ data: {
+ msg: sMainSub,
+ },
+ })
+ .then((response) => {
+ if (response.data.count == 1) {
+ this.subDisabled = true; //璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
+ this.$modal.msgSuccess(response.data.Message);
+ this.get_MAXNum_Task(1); //璁剧疆娴佹按鍙峰鍔�
+ if (response.data.Verify == "Y") {
+ //鑷姩瀹℃牳
+ this.set_CheckBill(0, this.form); //瀹℃牳
+ }
+ this.addBtnShow = true;
+ }
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ }
+ });
+ }
+ });
+ },
+ // 鍙嶅鏍�/瀹℃牳鏁版嵁
+ set_CheckBill(num, form) {
+ var InterID = form.hmainid || form.HInterID;
+ //閫昏緫瀹℃牳鏂规硶
+ axios
+ .get(this.baseURL + "/Kf_SellOutBill/AuditKf_SellOutBill", {
+ params: {
+ HInterID: InterID,
+ IsAudit: num,
+ CurUserName: sessionStorage["HUserName"],
+ },
+ })
+ .then((response) => {
+ let result = response.data;
+ if (result.code == 1) {
+ this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ } else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message);
+ }
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ showReset() {
+ this.deptShow = false;
+ this.warehouseShow = false;
+ this.materialShow = false;
+ },
+ // 鎵撳紑鏁版嵁鍒楄〃寮圭獥
+ openDataDialog(num, row) {
+ if (row) {
+ this.zbIndex = row.index - 1;
+ }
+ this.showReset();
+ if (num == 1) {
+ this.dialogTitle = "閮ㄩ棬鍒楄〃";
+ this.deptShow = true;
+ this.openData = true;
+ } else if (num == 2) {
+ this.dialogTitle = "鍑哄簱浠撳簱鍒楄〃";
+ this.warehouseShow = true;
+ this.openData = true;
+ } else if (num == 3) {
+ this.dialogTitle = "鐗╂枡鍒楄〃";
+ this.materialShow = true;
+ this.openData = true;
+ }
+ },
+ },
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+ width: 100%;
+}
+</style>
diff --git a/src/views/ICMO/ScICMOBillList.vue b/src/views/ICMO/ScICMOBillList.vue
index 7c13427..030a0e1 100644
--- a/src/views/ICMO/ScICMOBillList.vue
+++ b/src/views/ICMO/ScICMOBillList.vue
@@ -9,15 +9,23 @@
class="searchBox"
>
<el-row>
- <el-form-item label="鏃ユ湡" style="margin-left: 100px">
+ <el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px">
<el-date-picker
- v-model="dateRange"
- value-format="yyyy-MM-dd"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- ></el-date-picker>
+ v-model="sTime"
+ type="date"
+ placeholder="寮�濮嬫棩鏈�"
+ style="width: 150px"
+ >
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="缁撴潫鏃ユ湡">
+ <el-date-picker
+ v-model="eTime"
+ type="date"
+ placeholder="缁撴潫鏃ユ湡"
+ style="width: 150px"
+ >
+ </el-date-picker>
</el-form-item>
<el-form-item label="鏃ユ湡闂撮殧">
<el-select
@@ -51,7 +59,7 @@
v-for="(item, index) in organizationList"
:key="index"
:label="item.Name"
- :value="item.ID"
+ :value="item.ID.toString()"
>
</el-option>
</el-select>
@@ -68,8 +76,8 @@
<el-option
:label="item.label"
:value="item.value"
- :key="item.label"
- v-for="item in [
+ :key="index"
+ v-for="(item, index) in [
{
label: '寮�宸�',
value: '寮�宸�',
@@ -604,7 +612,7 @@
class="xsckdBox"
:before-close="close"
>
- <edit
+ <!-- <edit
:OperationType="OperationType"
:linterid="this.rowForm.HItemID"
:HSouceBillType="this.rowForm.HSourceBillType"
@@ -612,7 +620,10 @@
:copyType="copyType"
@editCloseGy="editGyClose"
v-if="editShow"
- />
+ /> -->
+ <div style="height: 80vh" v-if="openEdit">
+ <iframe :src="iframeUrl" width="100%" height="100%" frameborder="0"></iframe>
+ </div>
</el-dialog>
<el-dialog
:title="upload.title"
@@ -718,6 +729,7 @@
},
data() {
return {
+ iframeUrl: "",
activeSeach: "",
HModName: "Cg_POOrderBillList",
editShow: false,
@@ -800,7 +812,7 @@
dateRange: [],
// 鏌ヨ鍙傛暟
queryParams: {
- HOrgID: null,
+ HOrgID: sessionStorage["OrganizationID"],
HName: null,
HNumber: null,
Comparator1: "",
@@ -877,13 +889,20 @@
uploadTotal: 0,
};
},
- mounted() {},
+ mounted() {
+ window.editGyClose = () => {
+ this.editGyClose(); // 缁勪欢鍐呯殑鏂规硶缁戝畾鍒皐indows
+ };
+ },
created() {
- this.form.Organization = sessionStorage["Organization"];
this.riqiChange();
this.get_HProjectList();
this.get_HDeptNameList();
this.getList();
+ },
+ beforeDestroy() {
+ // 缁勪欢閿�姣佹椂娓呯悊鍏ㄥ眬鏂规硶锛岄伩鍏嶅唴瀛樻硠婕�
+ delete window.editGyClose;
},
methods: {
syncBill() {
@@ -898,10 +917,12 @@
let res = await axios.get(`${this.baseURL}/Sc_ICMOBill/GetHDeptList`, {
params: { HOrgID: sessionStorage["OrganizationID"] },
});
- console.log(res);
- this.HDeptNameList = res.data.data.map((e) => {
- return { label: e.HName, value: e.HItemID };
- });
+ this.HDeptNameList = [
+ { label: "鍏ㄩ儴杞﹂棿", value: 0 },
+ ...res.data.data.map((e) => {
+ return { label: e.HName, value: e.HItemID };
+ }),
+ ];
},
async get_HProjectList() {
let res = await axios.get(`${this.baseURL}/Gy_Material/Get_HProject`);
@@ -1037,52 +1058,21 @@
this.dbEmitData(this.deptform, this.dialogTypeNum);
this.deptform = {};
},
- fetchData() {
- //鐧诲綍鐢ㄦ埛淇℃伅
- axios
- .get(
- "http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
- )
- .then((res) => {
- let data = res.data.data[0];
- this.zuzhiId = data.HUSEORGID; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
- this.queryParams.HOrgID = data.HUSEORGID;
- this.user = data.Czymc;
- axios
- .get(this.baseURL + "/Web/GetOrganizations", {})
- .then((res) => {
- if (res.data.count == 1) {
- this.organizationList = res.data.data; //缁勭粐鍒楄〃
- }
-
- this.handleQuery();
- // this.getList();
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
async getList() {
this.tableShow = false;
this.loading = true;
if (this.pageSize == 0) {
this.pageSize = 50;
}
- this.queryParams.HOrgID = sessionStorage["OrganizationID"];
- if (this.dateRange.length > 0) {
- this.sWhere +=
- " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.dateRange[0] + "'";
- this.sWhere +=
- " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.dateRange[1] + "'";
+ if (this.sTime) {
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
}
let Organization = this.organizationList.find(
- (e) => (e.ID = this.queryParams.HOrgID)
+ (e) => e.ID == this.queryParams.HOrgID
)?.Name;
+ console.log(this.queryParams.HOrgID);
console.log(Organization);
@@ -1349,7 +1339,7 @@
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
this.OperationType = 3;
- this.handleEdit();
+ this.handleEdit(row, this.OperationType);
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
@@ -1539,13 +1529,16 @@
//鎵撳紑鏂板缁勪欢寮圭獥
handleAddEdit() {
this.rowForm.HItemID = 0;
+ this.iframeUrl = `/iframe/ScICMOBillEdit?HInterID=0&OperationType=1`;
this.$nextTick(() => {
this.openEdit = true;
this.editShow = true;
});
},
//鎵撳紑淇敼缁勪欢寮圭獥
- handleEdit() {
+ handleEdit(row, OperationType) {
+ console.log(row);
+ this.iframeUrl = `/iframe/ScICMOBillEdit?HInterID=${row.hmainid}&OperationType=${OperationType}&HEntryID=${row.hsubid}`;
this.$nextTick(() => {
this.openEdit = true;
this.editShow = true;
diff --git a/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue b/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
index 4383b6f..266b2ed 100644
--- a/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
+++ b/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
@@ -9,15 +9,23 @@
class="searchBox"
>
<el-row>
- <el-form-item label="鏃ユ湡" style="margin-left: 100px">
+ <el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px">
<el-date-picker
- v-model="dateRange"
- value-format="yyyy-MM-dd"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- ></el-date-picker>
+ v-model="sTime"
+ type="date"
+ placeholder="寮�濮嬫棩鏈�"
+ style="width: 150px"
+ >
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="缁撴潫鏃ユ湡">
+ <el-date-picker
+ v-model="eTime"
+ type="date"
+ placeholder="缁撴潫鏃ユ湡"
+ style="width: 150px"
+ >
+ </el-date-picker>
</el-form-item>
<el-form-item label="鏃ユ湡闂撮殧">
<el-select
@@ -482,14 +490,14 @@
</el-dialog>
<!-- 缂栬緫 -->
<el-dialog
- title="缂栬緫鑱屽憳"
+ title="缂栬緫鏀舵枡閫氱煡鍗�"
:visible.sync="openEdit"
width="1480px"
append-to-body
class="xsckdBox"
:before-close="close"
>
- <edit
+ <!-- <edit
:OperationType="OperationType"
:linterid="this.rowForm.HItemID"
:HSouceBillType="this.rowForm.HSourceBillType"
@@ -497,7 +505,10 @@
:copyType="copyType"
@editCloseGy="editGyClose"
v-if="editShow"
- />
+ /> -->
+ <div style="height: 80vh" v-if="openEdit">
+ <iframe :src="iframeUrl" frameborder="0" width="100%" height="100%"></iframe>
+ </div>
</el-dialog>
<el-dialog
:title="upload.title"
@@ -604,6 +615,7 @@
},
data() {
return {
+ iframeUrl: "",
activeSeach: "",
dateRange: [],
HModName: "Cg_POOrderBillList",
@@ -759,10 +771,17 @@
},
mounted() {
this.queryParams.HOrgID = sessionStorage["Organization"];
+ window.editGyClose = () => {
+ this.editGyClose(); // 缁勪欢鍐呯殑鏂规硶缁戝畾鍒皐indows
+ };
},
created() {
this.riqiChange();
this.getList();
+ },
+ beforeDestroy() {
+ // 缁勪欢閿�姣佹椂娓呯悊鍏ㄥ眬鏂规硶锛岄伩鍏嶅唴瀛樻硠婕�
+ delete window.editGyClose;
},
methods: {
onDateScanOptionChangerHandler(e) {
@@ -851,7 +870,6 @@
const ddE = String(end.getDate()).padStart(2, "0");
this.sTime = yyyyS + "-" + mmS + "-" + ddS;
this.eTime = yyyyE + "-" + mmE + "-" + ddE;
- this.dateRange = [this.sTime, this.eTime];
},
organizationChange(val) {
// let options=undefined
@@ -897,11 +915,9 @@
this.pageSize = 50;
}
- if (this.dateRange.length > 0) {
- this.sWhere +=
- " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.dateRange[0] + "'";
- this.sWhere +=
- " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.dateRange[1] + "'";
+ if (this.sTime && this.eTime) {
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
}
try {
let res = await axios.get(this.baseURL + "Cg_POInStockBill/page", {
@@ -1337,7 +1353,7 @@
//鎵撳紑鏂板缁勪欢寮圭獥
handleAddEdit() {
this.rowForm.HItemID = 0;
- this.iframeUrl = `/iframe/XsSeOutStockBackBillEdit?HInterID=${0}&OperationType=${1}©Type=${-1}`;
+ this.iframeUrl = `/iframe/CgPoInStockBillEdit?HInterID=${0}&OperationType=${1}©Type=${-1}`;
this.$nextTick(() => {
this.openEdit = true;
this.editShow = true;
@@ -1345,7 +1361,7 @@
},
//鎵撳紑淇敼缁勪欢寮圭獥
handleEdit(row, OperationType, copyType) {
- this.iframeUrl = `/iframe/XsSeOutStockBackBillEdit?HInterID=${row.hmainid}&OperationType=${OperationType}©Type=${copyType}`;
+ this.iframeUrl = `/iframe/CgPoInStockBillEdit?HInterID=${row.hmainid}&OperationType=${OperationType}©Type=${copyType}`;
this.$nextTick(() => {
this.openEdit = true;
this.editShow = true;
diff --git a/src/views/purchase/cgPoInStockBill/cgPoInStockBillEdit.vue b/src/views/purchase/cgPoInStockBill/cgPoInStockBillEdit.vue
index 5421a43..8e6604a 100644
--- a/src/views/purchase/cgPoInStockBill/cgPoInStockBillEdit.vue
+++ b/src/views/purchase/cgPoInStockBill/cgPoInStockBillEdit.vue
@@ -35,15 +35,15 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="閲囪喘鍛�" prop="HEmpName">
- <el-input v-model="form.HEmpName" placeholder="璇烽�夋嫨閲囪喘鍛�" disabled>
+ <el-form-item label="涓氬姟鍛�" prop="HEmpName">
+ <el-input v-model="form.HEmpName" placeholder="璇烽�夋嫨涓氬姟鍛�" disabled>
<el-button slot="append" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="閮ㄩ棬" prop="HDeptName">
- <el-input v-model="form.HCusName" placeholder="璇烽�夋嫨閲囪喘閮ㄩ棬" disabled>
+ <el-input v-model="form.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" disabled>
<el-button slot="append" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
@@ -52,7 +52,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="渚涘簲鍟�" prop="HSupName">
- <el-input v-model="form.HWHName" placeholder="璇烽�夋嫨渚涘簲鍟�" disabled>
+ <el-input v-model="form.HSupName" placeholder="璇烽�夋嫨渚涘簲鍟�" disabled>
<el-button
slot="append"
icon="el-icon-search"
@@ -69,15 +69,13 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="姹囩巼" prop="HRemarHExRatek">
+ <el-form-item label="姹囩巼" prop="HExRate">
<el-input-number v-model="form.HExRate" placeholder="璇疯緭鍏ユ眹鐜�" />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鍙戠エ缂栧彿" prop="HWHName">
- <el-input v-model="form.HWHName" placeholder="璇烽�夋嫨浠撳簱">
- <el-button slot="append" icon="el-icon-search"></el-button>
- </el-input>
+ <el-form-item label="鍙戠エ缂栧彿" prop="HInvoiceBillNo">
+ <el-input v-model="form.HInvoiceBillNo" placeholder=""> </el-input>
</el-form-item>
</el-col>
</el-row>
@@ -105,7 +103,12 @@
<el-col :span="6">
<el-form-item label="缁勭粐" prop="HOrgID">
<el-select v-model="form.HOrgID">
- <el-option></el-option>
+ <el-option
+ v-for="(item, index) in organizationList"
+ :key="index"
+ :label="item.Name"
+ :value="item.ID"
+ ></el-option>
</el-select>
</el-form-item> </el-col
></el-row>
@@ -281,6 +284,11 @@
<span>{{ scope.row.璁￠噺鍗曚綅 }}</span>
</template>
</el-table-column>
+ <el-table-column align="center" label="鏀舵枡浠撳簱" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.鏀舵枡浠撳簱 }}</span>
+ </template>
+ </el-table-column>
<el-table-column align="center" label="鏁伴噺" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HQty }}</span>
@@ -289,6 +297,16 @@
<el-table-column align="center" label="鍗曚环" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HPrice }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍚◣鍗曚环" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HTaxPrice }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="閲戦" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HMoney }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="澶囨敞" width="120">
@@ -381,7 +399,7 @@
deptform: {}, //寮圭獥閫変腑鏁版嵁
openData: false, //鏁版嵁寮圭獥
dialogTitle: "",
- organizationList: [], //缁勭粐鍒楄〃
+ organizationList: JSON.parse(sessionStorage["organizationList"]), // 缁勭粐鍒楄〃
subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
// OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
@@ -436,7 +454,7 @@
};
},
created() {
- this.fetchData();
+ // this.fetchData();
this.getdata();
},
beforeDestroy() {
@@ -753,8 +771,11 @@
//閫�鍑�
close() {
this.reset();
-
- if (!this.OperationType2 && !this.copyType) {
+ if (window.self != window.top) {
+ // iframe椤甸潰
+ console.log(window.parent);
+ window.parent.editGyClose();
+ } else if (!this.OperationType2 && !this.copyType) {
// this.$router.back()
window.close();
} else {
@@ -854,7 +875,7 @@
this.reset();
let rowHmainid = this.HInterID2;
axios
- .get(this.baseURL + "/Xs_SeOutStockBill/cx", {
+ .get(this.baseURL + "/Cg_POInStockBill/cx", {
params: { HInterID: rowHmainid },
})
.then((response) => {
@@ -864,46 +885,55 @@
this.form.BillType = data.HSourceBillType;
Object.assign(this.form, {
HBillNo: data.鍗曟嵁鍙�,
- HInterID: data.hmainid,
- HDate: dayjs(data.鏃ユ湡).format("YYYY-MM-DD"),
- HSeOrderBillNo_M: data.閿�鍞鍗曞彿,
+ HDate: dayjs(data.鏃ユ湡),
+ HInnerBillNo: data.鍐呴儴鍗曟嵁鍙�,
HEmpID: data.HEmpID,
HEmpName: data.涓氬姟鍛�,
- HCusID: data.HCusID,
- HCusName: data.瀹㈡埛,
- HWHID: data.涓讳粨搴揑D,
- HWHName: data.涓诲彂璐т粨搴�,
- HAddress: data.浜よ揣鍦板潃,
- HDeptName: data.閮ㄩ棬,
- HDeptID: data.HDeptID,
+ HSupID: data.HSupID,
+ HSupName: data.渚涘簲鍟�,
+ HWHID: data.涓昏〃浠撳簱ID,
+ HWHName: data.涓昏〃浠撳簱,
HCurID: data.HCurID,
HCurName: data.甯佸埆,
- HSSID: data.HSSID,
- HSSName: data.缁撶畻鏂瑰紡,
HExRate: data.姹囩巼,
+ HDeptName: data.閮ㄩ棬,
+ HDeptID: data.HDeptID,
HManagerName: data.涓荤,
HManagerID: data.HManagerID,
HSourceBillType: data.婧愬崟绫诲瀷,
- HLinkMan: data.鑱旂郴浜�,
- HLinkPhone: data.鑱旂郴鐢佃瘽,
- //, "HConveyCompID": data.杩愯緭鍏徃
- //, "HConveyTypeID": data.杩愯緭鏂瑰紡
- //, "HConveyMoney": data.杩愯垂
- //, "HDFflag": data.鏄惁鍨粯
+ HAddress: data.浜よ揣鍦扮偣,
+ HExRate: data.姹囩巼,
HProjectID: data.HProjectID,
- HProjectNumber: data.椤圭洰缂栫爜,
+ HProjectNumber: data.椤圭洰浠ｇ爜,
HProjectName: data.椤圭洰鍚嶇О,
-
+ HInvoiceBillNo: data.鍙戠エ缂栧彿,
Box2: "",
HRemark: data.琛ㄥご澶囨敞,
HMaker: data.鍒跺崟浜�,
HChecker: data.瀹℃牳浜�,
HCloseMan: data.鍏抽棴浜�,
- HMakeDate: data.鍒跺崟鏃ユ湡,
- HCheckDate: data.瀹℃牳鏃ユ湡,
- HCloseDate: data.鍏抽棴鏃ユ湡,
- HUpDateDate: data.淇敼鏃ユ湡,
- HDeleteDate: data.浣滃簾鏃ユ湡,
+ HUpDater: data.淇敼浜�,
+ HDeleteMan: data.浣滃簾浜�,
+ HMakeDate:
+ data.鍒跺崟鏃ユ湡 == null
+ ? ""
+ : dayjs(data.鍒跺崟鏃ユ湡).format("YYYY-MM-DD hh:mm:ss"),
+ HCheckDate:
+ data.瀹℃牳鏃ユ湡 == null
+ ? ""
+ : dayjs(data.瀹℃牳鏃ユ湡).format("YYYY-MM-DD hh:mm:ss"),
+ HCloseDate:
+ data.鍏抽棴鏃ユ湡 == null
+ ? ""
+ : dayjs(data.鍏抽棴鏃ユ湡).format("YYYY-MM-DD hh:mm:ss"),
+ HUpDateDate:
+ data.淇敼鏃ユ湡 == null
+ ? ""
+ : dayjs(data.淇敼鏃ユ湡).format("YYYY-MM-DD hh:mm:ss"),
+ HDeleteDate:
+ data.浣滃簾鏃ユ湡 == null
+ ? ""
+ : dayjs(data.浣滃簾鏃ユ湡).format("YYYY-MM-DD hh:mm:ss"),
});
if (this.copyType == 1) {
this.getHBillNo();
@@ -924,7 +954,7 @@
this.form.HCloseDate = data.鍏抽棴鏃ユ湡;
this.form.HDeleteDate = data.浣滃簾鏃ユ湡;
}
- this.getCustomerByCusID(response.data.data[0].HCusID); //鏍规嵁瀹㈡埛鑾峰彇鑱旂郴浜猴紝鑱旂郴浜虹數璇�
+ // this.getCustomerByCusID(response.data.data[0].HCusID); //鏍规嵁瀹㈡埛鑾峰彇鑱旂郴浜猴紝鑱旂郴浜虹數璇�
let subdata = result.data;
for (var i = 0; i < subdata.length; i++) {
this.editData.push({
@@ -935,11 +965,19 @@
HUnitID: subdata[i].HUnitID,
璁￠噺鍗曚綅: subdata[i].璁￠噺鍗曚綅,
HWHID: subdata[i].HWHID,
- 鍙戣揣浠撳簱: subdata[i].鍙戣揣浠撳簱,
+ 鏀舵枡浠撳簱: subdata[i].鏀舵枡浠撳簱,
+ HSPID: subdata[i].HSPID,
+ 浠撲綅鍚嶇О: subdata[i].浠撲綅鍚嶇О,
+ HSecUnitID: subdata[i].HSecUnitID,
+ 杈呭姪鍗曚綅: subdata[i].杈呭姪鍗曚綅,
HQty: subdata[i].鏁伴噺,
- HPrice: subdata[i].鍗曚环,
- HMoney: subdata[i].閲戦,
HRemark: subdata[i].琛ㄤ綋澶囨敞,
+ HPrice: subdata[i].鍗曚环,
+ HTaxPrice: subdata[i].鍚◣鍗曚环,
+ HMoney: subdata[i].閲戦,
+ HDiscountRate: subdata[i].鎶樻墸鐜�,
+ HTaxRate: subdata[i].绋庣巼,
+ HTaxMoney: subdata[i].绋庨,
HSourceBillNo: subdata[i].婧愬崟鍗曞彿, //婧愬崟鍙�
HSourceBillType: subdata[i].婧愬崟绫诲瀷, //婧愬崟绫诲瀷
HSourceInterID: subdata[i].婧愬崟涓诲唴鐮�, //婧愬崟涓诲唴鐮�
@@ -957,23 +995,6 @@
.catch((error) => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触! ");
console.error(error);
- });
- },
- //鏍规嵁瀹㈡埛甯﹀嚭鑱旂郴浜恒�佽仈绯荤數璇�
- getCustomerByCusID(HCusID) {
- axios
- .get(this.baseURL + "/Xs_SeOrderBill/getCustomerByCusID", {
- params: {
- HCusID: HCusID,
- },
- })
- .then((response) => {
- this.form.鑱旂郴浜� = response.data.data[0].HLinkMan;
- this.form.鑱旂郴鐢佃瘽 = response.data.data[0].HLinkPhone;
- // this.form = response.data.data[0]
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
},
/** 閿�鍞嚭搴撳瓙琛ㄦ槑缁嗗簭鍙� */
diff --git a/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue b/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue
index f7d1bf6..eda3df9 100644
--- a/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue
+++ b/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue
@@ -9,15 +9,23 @@
class="searchBox"
>
<el-row>
- <el-form-item label="鏃ユ湡" style="margin-left: 100px">
+ <el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px">
<el-date-picker
- v-model="dateRange"
- value-format="yyyy-MM-dd"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- ></el-date-picker>
+ v-model="sTime"
+ type="date"
+ placeholder="寮�濮嬫棩鏈�"
+ style="width: 150px"
+ >
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="缁撴潫鏃ユ湡">
+ <el-date-picker
+ v-model="eTime"
+ type="date"
+ placeholder="缁撴潫鏃ユ湡"
+ style="width: 150px"
+ >
+ </el-date-picker>
</el-form-item>
<el-form-item label="鏃ユ湡闂撮殧">
<el-select
@@ -50,8 +58,8 @@
<el-option
v-for="(item, index) in organizationList"
:key="index"
- :label="item.Name"
- :value="item.ID"
+ :label="item.label"
+ :value="item.value"
>
</el-option>
</el-select>
@@ -264,7 +272,7 @@
icon="el-icon-edit"
size="mini"
:disabled="single"
- @click="handleEdit((row = rowForm), (OperationType = 3))"
+ @click="handleEdit((row = rowForm), (OperationType = 3), (copyType = -1))"
>缂栬緫</el-button
>
</el-col>
@@ -274,7 +282,7 @@
icon="el-icon-edit"
size="mini"
:disabled="single"
- @click="handleEdit((row = rowForm), (OperationType = 2))"
+ @click="handleEdit((row = rowForm), (OperationType = 2), (copyType = 1))"
>澶嶅埗</el-button
>
</el-col>
@@ -463,7 +471,7 @@
}}</span>
<el-button
type="text"
- @click="handleEdit(row, (OperationType = 3))"
+ @click="handleEdit(row, (OperationType = 3), (copyType = 1))"
v-else-if="column.property == '鍗曟嵁鍙�'"
>{{ row.鍗曟嵁鍙� }}</el-button
>
@@ -496,22 +504,16 @@
</el-dialog>
<!-- 缂栬緫 -->
<el-dialog
- title="缂栬緫鑱屽憳"
+ title="缂栬緫閲囪喘璁㈠崟"
:visible.sync="openEdit"
width="1480px"
append-to-body
class="xsckdBox"
:before-close="close"
>
- <edit
- :OperationType="OperationType"
- :linterid="this.rowForm.HItemID"
- :HSouceBillType="this.rowForm.HSourceBillType"
- :HOrgID="this.queryParams.HOrgID"
- :copyType="copyType"
- @editCloseGy="editGyClose"
- v-if="editShow"
- />
+ <div style="height: 80vh" v-if="openEdit">
+ <iframe :src="iframeUrl" frameborder="0" width="100%" height="100%"></iframe>
+ </div>
</el-dialog>
<el-dialog
:title="upload.title"
@@ -618,6 +620,7 @@
},
data() {
return {
+ iframeUrl: "",
activeSeach: "",
HModName: "Cg_POOrderBillList",
editShow: false,
@@ -778,6 +781,15 @@
this.getList();
},
methods: {
+ handleTabActive() {
+ window.editGyClose = () => {
+ this.editGyClose(); // 缁勪欢鍐呯殑鏂规硶缁戝畾鍒皐indows
+ };
+ },
+ handleTabInactive() {
+ // 缁勪欢閿�姣佹椂娓呯悊鍏ㄥ眬鏂规硶锛岄伩鍏嶅唴瀛樻硠婕�
+ delete window.editGyClose;
+ },
onDateScanOptionChangerHandler(e) {
this.queryParams.timeSpan = e;
if (e == -1) {
@@ -863,7 +875,6 @@
const ddE = String(end.getDate()).padStart(2, "0");
this.sTime = yyyyS + "-" + mmS + "-" + ddS;
this.eTime = yyyyE + "-" + mmE + "-" + ddE;
- this.dateRange = [this.sTime, this.eTime];
},
organizationChange(val) {
// let options=undefined
@@ -908,11 +919,9 @@
if (this.pageSize == 0) {
this.pageSize = 50;
}
- if (this.dateRange.length > 0) {
- this.sWhere +=
- " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.dateRange[0] + "'";
- this.sWhere +=
- " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.dateRange[1] + "'";
+ if (this.sTime) {
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
}
// this.sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) >= '2020-01-01' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2030-01-01'`;
//鐢熶骇璧勬枡鍒楄〃
@@ -1177,7 +1186,7 @@
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
this.OperationType = 3;
- this.handleEdit();
+ this.handleEdit(row, 3, 1);
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
@@ -1366,13 +1375,15 @@
//鎵撳紑鏂板缁勪欢寮圭獥
handleAddEdit() {
this.rowForm.HItemID = 0;
+ this.iframeUrl = `/iframe/CgPoOrderBillEdit?HInterID=${0}&OperationType=${1}©Type=${-1}`;
this.$nextTick(() => {
this.openEdit = true;
this.editShow = true;
});
},
//鎵撳紑淇敼缁勪欢寮圭獥
- handleEdit() {
+ handleEdit(row, OperationType, copyType) {
+ this.iframeUrl = `/iframe/CgPoOrderBillEdit?HInterID=${row.hmainid}&OperationType=${OperationType}©Type=${copyType}`;
this.$nextTick(() => {
this.openEdit = true;
this.editShow = true;
diff --git a/src/views/purchase/cgPoOrderBill/cgPoOrderBillEdit.vue b/src/views/purchase/cgPoOrderBill/cgPoOrderBillEdit.vue
index b60d0ca..1d4929a 100644
--- a/src/views/purchase/cgPoOrderBill/cgPoOrderBillEdit.vue
+++ b/src/views/purchase/cgPoOrderBill/cgPoOrderBillEdit.vue
@@ -56,14 +56,14 @@
<el-row>
<el-col :span="6">
<el-form-item label="閲囪喘閮ㄩ棬" prop="HDeptName">
- <el-input v-model="form.HCusName" placeholder="璇烽�夋嫨閲囪喘閮ㄩ棬" disabled>
+ <el-input v-model="form.HDeptName" placeholder="璇烽�夋嫨閲囪喘閮ㄩ棬" disabled>
<el-button slot="append" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="渚涘簲鍟�" prop="HSupName">
- <el-input v-model="form.HWHName" placeholder="璇烽�夋嫨渚涘簲鍟�" disabled>
+ <el-input v-model="form.HSupName" placeholder="璇烽�夋嫨渚涘簲鍟�" disabled>
<el-button
slot="append"
icon="el-icon-search"
@@ -111,7 +111,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="姹囩巼" prop="HRemarHExRatek">
+ <el-form-item label="姹囩巼" prop="HExRate">
<el-input-number v-model="form.HExRate" placeholder="璇疯緭鍏ユ眹鐜�" />
</el-form-item>
</el-col>
@@ -143,8 +143,8 @@
<el-option
v-for="(item, index) in organizationList"
:key="index"
- :label="item.label"
- :value="item.value"
+ :label="item.Name"
+ :value="item.ID"
></el-option>
</el-select>
</el-form-item> </el-col
@@ -421,7 +421,7 @@
deptform: {}, //寮圭獥閫変腑鏁版嵁
openData: false, //鏁版嵁寮圭獥
dialogTitle: "",
- organizationList: [], //缁勭粐鍒楄〃
+ organizationList: JSON.parse(sessionStorage["organizationList"]), //缁勭粐鍒楄〃
subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
// OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
@@ -476,7 +476,7 @@
};
},
created() {
- this.fetchData();
+ // this.fetchData();
this.getdata();
},
beforeDestroy() {
@@ -509,7 +509,6 @@
this.HInterID2 = this.$route.query.HInterID || this.linterid || 0;
this.OperationType2 = this.$route.query.OperationType || this.OperationType || 1;
this.CopyType2 = this.$route.query.copyType || this.copyType || -1;
- console.log(this.CopyType2, this.OperationType2, this.HInterID2);
this.formShow = false;
this.formLoading = true;
@@ -795,8 +794,10 @@
//閫�鍑�
close() {
this.reset();
-
- if (!this.OperationType2 && !this.copyType) {
+ if (window.self != window.top) {
+ // iframe 椤甸潰 璋冪敤鐖堕〉闈㈡柟娉曞叧闂脊绐�
+ window.parent.editGyClose();
+ } else if (!this.OperationType2 && !this.copyType) {
// this.$router.back()
window.close();
} else {
@@ -896,7 +897,7 @@
this.reset();
let rowHmainid = this.HInterID2;
axios
- .get(this.baseURL + "/Xs_SeOutStockBill/cx", {
+ .get(this.baseURL + "/Cg_POOrderBill/cx", {
params: { HInterID: rowHmainid },
})
.then((response) => {
@@ -905,47 +906,61 @@
var data = response.data.data[0];
this.form.BillType = data.HSourceBillType;
Object.assign(this.form, {
- HBillNo: data.鍗曟嵁鍙�,
- HInterID: data.hmainid,
- HDate: dayjs(data.鏃ユ湡).format("YYYY-MM-DD"),
- HSeOrderBillNo_M: data.閿�鍞鍗曞彿,
+ HBillNo: data.鍗曟嵁鍙�, //璁剧疆鍗曟嵁鍙风殑绗竴涓�间负鈥淗BillNo鈥濆瓧娈电殑鍊兼槸data.鍗曟嵁鍙穈鐨勫��
+ HDate: dayjs(data.鏃ユ湡).format("YYYY-MM-DD"), //璁剧疆鈥淗Date鈥濆瓧娈电殑鍊间负`data.鏃ユ湡`缁忚繃`dayjs`鍑芥暟澶勭悊鍚庣殑鏍煎紡
+ HSSDate: dayjs(data.缁撶畻鏃ユ湡).format("YYYY-MM-DD"), //浣嗚缃殑鏄�滅粨绠楁棩鏈熲�濆瓧娈点��
+ //,"HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+ HAddress: data.浜よ揣鍦扮偣, // 璁剧疆鈥滀氦璐у湴鐐光�濆瓧娈电殑鍊笺��
+ HDeptName: data.閮ㄩ棬, // 璁剧疆鈥滈儴闂ㄢ�濆悕绉板瓧娈电殑鍊笺��
+ HDeptID: data.HDeptID, // 璁剧疆鈥淗DeptID鈥濆悕绉板瓧娈电殑鍊笺��
+ HSupID: data.HSupID, // 璁剧疆鈥淗SupID鈥濆悕绉板瓧娈电殑鍊笺��
+ HSupName: data.渚涘簲鍟�, // 璁剧疆鈥滀緵搴斿晢鈥濆悕绉板瓧娈电殑鍊笺��
HEmpID: data.HEmpID,
- HEmpName: data.涓氬姟鍛�,
- HCusID: data.HCusID,
- HCusName: data.瀹㈡埛,
- HWHID: data.涓讳粨搴揑D,
- HWHName: data.涓诲彂璐т粨搴�,
- HAddress: data.浜よ揣鍦板潃,
- HDeptName: data.閮ㄩ棬,
- HDeptID: data.HDeptID,
+ HEmpName: data.涓氬姟鍛�, // 璁剧疆鈥滀笟鍔″憳鈥濆悕绉板瓧娈电殑鍊笺��
HCurID: data.HCurID,
- HCurName: data.甯佸埆,
- HSSID: data.HSSID,
- HSSName: data.缁撶畻鏂瑰紡,
- HExRate: data.姹囩巼,
- HManagerName: data.涓荤,
+ HCurName: data.甯佸埆, // 璁剧疆鈥滃竵鍒�濆悕绉板瓧娈电殑鍊笺��
+ HExRate: data.姹囩巼, // 璁剧疆鈥滄眹鐜団�濆悕绉板瓧娈电殑鍊笺��
+ HManagerName: data.涓荤, // 璁剧疆鈥滀富绠♀�濆悕绉板瓧娈电殑鍊笺��
HManagerID: data.HManagerID,
- HSourceBillType: data.婧愬崟绫诲瀷,
- HLinkMan: data.鑱旂郴浜�,
- HLinkPhone: data.鑱旂郴鐢佃瘽,
- //, "HConveyCompID": data.杩愯緭鍏徃
- //, "HConveyTypeID": data.杩愯緭鏂瑰紡
- //, "HConveyMoney": data.杩愯垂
- //, "HDFflag": data.鏄惁鍨粯
+ HPSStyleID: data.HPSStyleID,
+ HPSStyleName: data.閲囪喘鏂瑰紡, // 璁剧疆鈥滈噰璐柟寮忊�濆悕绉板瓧娈电殑鍊笺��
+ HSSID: data.HSSID,
+ HSSName: data.缁撶畻鏂瑰紡, // 璁剧疆鈥滅粨绠楁柟寮忊�濆悕绉板瓧娈电殑鍊笺��
+ HLinkMan: data.鑱旂郴浜�, // 璁剧疆鈥滆仈绯讳汉鈥濆悕绉板瓧娈电殑鍊笺��
+ HLinkPhone: data.鑱旂郴浜虹數璇�, // 璁剧疆鈥滆仈绯荤數璇濃�濆悕绉板瓧娈电殑鍊笺��
+ HInnerBillNo: data.杈呭姪瀛楁, // 璁剧疆鈥滆緟鍔╁瓧娈碘�濆悕绉板瓧娈电殑鍊笺��
HProjectID: data.HProjectID,
- HProjectNumber: data.椤圭洰缂栫爜,
- HProjectName: data.椤圭洰鍚嶇О,
-
- Box2: "",
- HRemark: data.琛ㄥご澶囨敞,
- HMaker: data.鍒跺崟浜�,
- HChecker: data.瀹℃牳浜�,
- HCloseMan: data.鍏抽棴浜�,
- HMakeDate: data.鍒跺崟鏃ユ湡,
- HCheckDate: data.瀹℃牳鏃ユ湡,
- HCloseDate: data.鍏抽棴鏃ユ湡,
- HUpDateDate: data.淇敼鏃ユ湡,
- HDeleteDate: data.浣滃簾鏃ユ湡,
+ HProjectNumber: data.椤圭洰浠ｇ爜, // 璁剧疆鈥滈」鐩唬鐮佲�濆悕绉板瓧娈电殑鍊笺��
+ HProjectName: data.椤圭洰鍚嶇О, // 璁剧疆鈥滈」鐩悕绉扳�濆悕绉板瓧娈电殑鍊笺��
+ HWHID: data.HWHID,
+ HOrgID: data.HOrgID,
+ HWHName: data.浠撳簱, // 璁剧疆鈥滀粨搴撯�濆悕绉板瓧娈电殑鍊笺��
+ HRemark: data.琛ㄥご澶囨敞, // 璁剧疆鈥滆〃澶村娉ㄢ�濆悕绉板瓧娈电殑鍊笺��
+ HMaker: data.鍒跺崟浜�, // 璁剧疆鈥滃埗鍗曚汉鈥濆悕绉板瓧娈电殑鍊笺��
+ HChecker: data.瀹℃牳浜�, // 璁剧疆鈥滃鏍镐汉鈥濆悕绉板瓧娈电殑鍊笺��
+ HCloseMan: data.鍏抽棴浜�, // 璁剧疆鈥滃叧闂汉鈥濆悕绉板瓧娈电殑鍊笺��
+ HUpDater: data.淇敼浜�, // 璁剧疆鈥滀慨鏀逛汉鈥濆悕绉板瓧娈电殑鍊笺��
+ HDeleteMan: data.浣滃簾浜�, // 璁剧疆鈥滀綔搴熶汉鈥濆悕绉板瓧娈电殑鍊笺��
+ HMakeDate:
+ data.鍒跺崟鏃ユ湡 == null
+ ? ""
+ : dayjs(data.鍒跺崟鏃ユ湡).format("yyyy-MM-dd hh:mm:ss"),
+ HCheckDate:
+ data.瀹℃牳鏃ユ湡 == null
+ ? ""
+ : dayjs(data.瀹℃牳鏃ユ湡).format("yyyy-MM-dd hh:mm:ss"),
+ HCloseDate:
+ data.鍏抽棴鏃ユ湡 == null
+ ? ""
+ : dayjs(data.鍏抽棴鏃ユ湡).format("yyyy-MM-dd hh:mm:ss"),
+ HUpDateDate:
+ data.淇敼鏃ユ湡 == null
+ ? ""
+ : dayjs(data.淇敼鏃ユ湡).format("yyyy-MM-dd hh:mm:ss"),
+ HDeleteDate:
+ data.浣滃簾鏃ユ湡 == null
+ ? ""
+ : dayjs(data.浣滃簾鏃ユ湡).format("yyyy-MM-dd hh:mm:ss"),
});
if (this.copyType == 1) {
this.getHBillNo();
@@ -966,7 +981,7 @@
this.form.HCloseDate = data.鍏抽棴鏃ユ湡;
this.form.HDeleteDate = data.浣滃簾鏃ユ湡;
}
- this.getCustomerByCusID(response.data.data[0].HCusID); //鏍规嵁瀹㈡埛鑾峰彇鑱旂郴浜猴紝鑱旂郴浜虹數璇�
+ // this.getCustomerByCusID(response.data.data[0].HCusID); //鏍规嵁瀹㈡埛鑾峰彇鑱旂郴浜猴紝鑱旂郴浜虹數璇�
let subdata = result.data;
for (var i = 0; i < subdata.length; i++) {
this.editData.push({
@@ -977,15 +992,19 @@
HUnitID: subdata[i].HUnitID,
璁￠噺鍗曚綅: subdata[i].璁￠噺鍗曚綅,
HWHID: subdata[i].HWHID,
- 鍙戣揣浠撳簱: subdata[i].鍙戣揣浠撳簱,
+ HWHName: subdata[i].浠撳簱鍚嶇О,
HQty: subdata[i].鏁伴噺,
+ HRemark: subdata[i].琛ㄤ綋澶囨敞,
HPrice: subdata[i].鍗曚环,
HMoney: subdata[i].閲戦,
- HRemark: subdata[i].琛ㄤ綋澶囨敞,
- HSourceBillNo: subdata[i].婧愬崟鍗曞彿, //婧愬崟鍙�
- HSourceBillType: subdata[i].婧愬崟绫诲瀷, //婧愬崟绫诲瀷
- HSourceInterID: subdata[i].婧愬崟涓诲唴鐮�, //婧愬崟涓诲唴鐮�
- HSourceEntryID: subdata[i].婧愬崟瀛愬唴鐮�, //婧愬崟瀛愬唴鐮�
+ HTaxRate: subdata[i].绋庣巼,
+ HTaxMoney: subdata[i].绋庨,
+ HlineTotal: subdata[i].浠风◣鍚堣,
+ HlineTotalBB: subdata[i].鏈綅甯佷环绋庡悎璁�,
+ HTaxPrice: subdata[i].鍚◣鍗曚环,
+ HDiscountRate: subdata[i].鎶樻墸鐜�,
+ HRelTaxPrice: subdata[i].瀹為檯鍚◣鍗曚环,
+ HDate: dayjs(new Date(subdata[i].浜よ揣鏃ユ湡)).format("YYYY-MM-DD"),
});
}
if (data.鐘舵�� != "鍒涘缓" && this.copyType != 1) {
@@ -999,23 +1018,6 @@
.catch((error) => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触! ");
console.error(error);
- });
- },
- //鏍规嵁瀹㈡埛甯﹀嚭鑱旂郴浜恒�佽仈绯荤數璇�
- getCustomerByCusID(HCusID) {
- axios
- .get(this.baseURL + "/Xs_SeOrderBill/getCustomerByCusID", {
- params: {
- HCusID: HCusID,
- },
- })
- .then((response) => {
- this.form.鑱旂郴浜� = response.data.data[0].HLinkMan;
- this.form.鑱旂郴鐢佃瘽 = response.data.data[0].HLinkPhone;
- // this.form = response.data.data[0]
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
},
/** 閿�鍞嚭搴撳瓙琛ㄦ槑缁嗗簭鍙� */
diff --git a/src/views/sell/XsSeOutStockBackBillEdit.vue b/src/views/sell/XsSeOutStockBackBillEdit.vue
index 8152077..19b4a6c 100644
--- a/src/views/sell/XsSeOutStockBackBillEdit.vue
+++ b/src/views/sell/XsSeOutStockBackBillEdit.vue
@@ -839,8 +839,10 @@
//閫�鍑�
close() {
this.reset();
-
- if (!this.OperationType2 && !this.copyType) {
+ if (window.top != window.self) {
+ // iframe 椤甸潰 璋冪敤鐖堕〉闈㈢殑鍑芥暟鍏抽棴寮圭獥
+ window.parent.editGyClose();
+ } else if (!this.OperationType2 && !this.copyType) {
// this.$router.back()
window.close();
} else {
diff --git a/src/views/sell/XsSeOutStockBackBillList.vue b/src/views/sell/XsSeOutStockBackBillList.vue
index ec0c6fd..423cde1 100644
--- a/src/views/sell/XsSeOutStockBackBillList.vue
+++ b/src/views/sell/XsSeOutStockBackBillList.vue
@@ -9,15 +9,23 @@
class="searchBox"
>
<el-row>
- <el-form-item label="鏃ユ湡" style="margin-left: 100px">
+ <el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px">
<el-date-picker
- v-model="dateRange"
- value-format="yyyy-MM-dd"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- ></el-date-picker>
+ v-model="sTime"
+ type="date"
+ placeholder="寮�濮嬫棩鏈�"
+ style="width: 150px"
+ >
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="缁撴潫鏃ユ湡">
+ <el-date-picker
+ v-model="eTime"
+ type="date"
+ placeholder="缁撴潫鏃ユ湡"
+ style="width: 150px"
+ >
+ </el-date-picker>
</el-form-item>
<el-form-item label="鏃ユ湡闂撮殧">
<el-select
@@ -776,10 +784,18 @@
uploadTotal: 0,
};
},
- mounted() {},
+ mounted() {
+ window.editGyClose = () => {
+ this.editGyClose(); // 缁勪欢鍐呯殑鏂规硶缁戝畾鍒皐indows
+ };
+ },
created() {
this.riqiChange();
this.getList();
+ },
+ beforeDestroy() {
+ // 缁勪欢閿�姣佹椂娓呯悊鍏ㄥ眬鏂规硶锛岄伩鍏嶅唴瀛樻硠婕�
+ delete window.editGyClose;
},
methods: {
BillSync() {
@@ -875,7 +891,6 @@
// const ddE = String(end.getDate()).padStart(2, "0");
this.sTime = start;
this.eTime = end;
- this.dateRange = [this.sTime, this.eTime];
},
organizationChange(val) {
// let options=undefined
@@ -929,11 +944,9 @@
// this.sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) >= '2020-01-01' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2030-01-01'`;
// 鏀舵枡閫氱煡鍗曞垪琛�
- if (this.dateRange.length > 0) {
- this.sWhere +=
- " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.dateRange[0] + "'";
- this.sWhere +=
- " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.dateRange[1] + "'";
+ if (this.sTime && this.eTime) {
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
}
try {
@@ -1285,6 +1298,7 @@
}
this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
}
+
if (this.queryParams.HBillNo) {
this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
}
diff --git a/src/views/sell/XsSeOutStockBill.vue b/src/views/sell/XsSeOutStockBill.vue
index 814a3c1..3ee1ef7 100644
--- a/src/views/sell/XsSeOutStockBill.vue
+++ b/src/views/sell/XsSeOutStockBill.vue
@@ -9,15 +9,23 @@
class="searchBox"
>
<el-row>
- <el-form-item label="鏃ユ湡" style="margin-left: 100px">
+ <el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px">
<el-date-picker
- v-model="dateRange"
- value-format="yyyy-MM-dd"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- ></el-date-picker>
+ v-model="sTime"
+ type="date"
+ placeholder="寮�濮嬫棩鏈�"
+ style="width: 150px"
+ >
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="缁撴潫鏃ユ湡">
+ <el-date-picker
+ v-model="eTime"
+ type="date"
+ placeholder="缁撴潫鏃ユ湡"
+ style="width: 150px"
+ >
+ </el-date-picker>
</el-form-item>
<el-form-item label="鏃ユ湡闂撮殧">
<el-select
@@ -784,11 +792,19 @@
uploadTotal: 0,
};
},
- mounted() {},
+ mounted() {
+ window.editGyClose = () => {
+ this.editGyClose(); // 缁勪欢鍐呯殑鏂规硶缁戝畾鍒皐indows
+ };
+ },
created() {
this.queryParams.HOrgID = sessionStorage["OrganizationID"];
this.riqiChange();
this.getList();
+ },
+ beforeDestroy() {
+ // 缁勪欢閿�姣佹椂娓呯悊鍏ㄥ眬鏂规硶锛岄伩鍏嶅唴瀛樻硠婕�
+ delete window.editGyClose;
},
methods: {
BillSync() {
@@ -933,11 +949,9 @@
// this.sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) >= '2020-01-01' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2030-01-01'`;
// 鏀舵枡閫氱煡鍗曞垪琛�
- if (this.dateRange.length > 0) {
- this.sWhere +=
- " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.dateRange[0] + "'";
- this.sWhere +=
- " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.dateRange[1] + "'";
+ if (this.sTime && this.eTime) {
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
}
let Organization = this.organizationList.find(
(e) => (e.ID = this.queryParams.HOrgID)
@@ -1291,6 +1305,7 @@
}
this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
}
+
if (this.queryParams.HBillNo) {
this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HNumber + "%'";
}
diff --git a/src/views/sell/XsSeOutStockBillEdit.vue b/src/views/sell/XsSeOutStockBillEdit.vue
index 72622a5..344e93b 100644
--- a/src/views/sell/XsSeOutStockBillEdit.vue
+++ b/src/views/sell/XsSeOutStockBillEdit.vue
@@ -835,8 +835,10 @@
//閫�鍑�
close() {
this.reset();
-
- if (!this.OperationType2 && !this.copyType) {
+ if (window.top != window.self) {
+ // iframe 椤甸潰 璋冪敤鐖堕〉闈㈢殑鍑芥暟鍏抽棴寮圭獥
+ window.parent.editGyClose();
+ } else if (!this.OperationType2 && !this.copyType) {
// this.$router.back()
window.close();
} else {
diff --git a/src/views/sell/sellOut/sellOutBill.vue b/src/views/sell/sellOut/sellOutBill.vue
index c07dc36..e94af0f 100644
--- a/src/views/sell/sellOut/sellOutBill.vue
+++ b/src/views/sell/sellOut/sellOutBill.vue
@@ -1,41 +1,90 @@
<template>
- <div style="padding: 10px;">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="78px" class="searchBox">
- <el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px;">
- <el-date-picker v-model="sTime" type="date" placeholder="寮�濮嬫棩鏈�" style="width: 150px;">
+ <div style="padding: 10px">
+ <el-form
+ :model="queryParams"
+ ref="queryForm"
+ size="small"
+ :inline="true"
+ label-width="78px"
+ class="searchBox"
+ >
+ <el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px">
+ <el-date-picker
+ v-model="sTime"
+ type="date"
+ placeholder="寮�濮嬫棩鏈�"
+ style="width: 150px"
+ >
</el-date-picker>
</el-form-item>
<el-form-item label="缁撴潫鏃ユ湡">
- <el-date-picker v-model="eTime" type="date" placeholder="缁撴潫鏃ユ湡" style="width: 150px;">
+ <el-date-picker
+ v-model="eTime"
+ type="date"
+ placeholder="缁撴潫鏃ユ湡"
+ style="width: 150px"
+ >
</el-date-picker>
</el-form-item>
<el-form-item label="鏃ユ湡闂撮殧">
- <el-select v-model="queryParams.HInitTimeCycle" placeholder="璇烽�夋嫨" @change="riqiChange" style="width: 150px;">
- <el-option v-for="(item, index) in rqsgList" :key="index" :label="item.label" :value="item.value">
+ <el-select
+ v-model="queryParams.HInitTimeCycle"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ style="width: 150px"
+ >
+ <el-option
+ v-for="(item, index) in rqsgList"
+ :key="index"
+ :label="item.label"
+ :value="item.value"
+ >
</el-option>
</el-select>
</el-form-item>
<el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
- <el-input v-model="queryParams.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" @keyup.enter.native="handleQuery" />
+ <el-input
+ v-model="queryParams.HBillNo"
+ placeholder="璇疯緭鍏ュ崟鎹彿"
+ @keyup.enter.native="handleQuery"
+ />
</el-form-item>
<el-form-item label="椤圭洰缂栧彿" prop="HBillNo">
- <el-input v-model="queryParams.HProjectNumber" placeholder="璇疯緭鍏ラ」鐩紪鍙�" @keyup.enter.native="HProjectNumber" />
+ <el-input
+ v-model="queryParams.HProjectNumber"
+ placeholder="璇疯緭鍏ラ」鐩紪鍙�"
+ @keyup.enter.native="HProjectNumber"
+ />
</el-form-item>
<el-form-item label-width="78px">
- <el-button type="primary" icon="el-icon-search" @click="handleQuery"> 鎼� 绱�</el-button>
+ <el-button type="primary" icon="el-icon-search" @click="handleQuery">
+ 鎼� 绱�</el-button
+ >
<el-button icon="el-icon-circle-close" @click="resetQuery">閲� 缃�</el-button>
</el-form-item>
<el-collapse v-model="activeSeach">
<el-collapse-item title="鏇村" name="1">
<el-card class="box-card">
<el-form-item label="瀹㈡埛" prop="HCusID">
- <el-input v-model="queryParams.HCusID" placeholder="璇疯緭鍏ュ鎴�" @keyup.enter.native="handleQuery" />
+ <el-input
+ v-model="queryParams.HCusID"
+ placeholder="璇疯緭鍏ュ鎴�"
+ @keyup.enter.native="handleQuery"
+ />
</el-form-item>
<el-form-item label="鐗╂枡浠ｇ爜" prop="HMaterNumber">
- <el-input v-model="queryParams.HMaterNumber" placeholder="璇疯緭鍏ョ墿鏂欎唬鐮�" @keyup.enter.native="handleQuery" />
+ <el-input
+ v-model="queryParams.HMaterNumber"
+ placeholder="璇疯緭鍏ョ墿鏂欎唬鐮�"
+ @keyup.enter.native="handleQuery"
+ />
</el-form-item>
<el-form-item label="鐗╂枡鍚嶇О" prop="HMaterName">
- <el-input v-model="queryParams.HMaterName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" @keyup.enter.native="handleQuery" />
+ <el-input
+ v-model="queryParams.HMaterName"
+ placeholder="璇疯緭鍏ョ墿鏂欏悕绉�"
+ @keyup.enter.native="handleQuery"
+ />
</el-form-item>
<div slot="header" class="clearfix"><span>杩囨护</span></div>
<div>
@@ -43,21 +92,41 @@
<el-form-item label-width="0">
<el-row>
<el-col :span="7">
- <el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <el-select
+ v-model="queryParams.ColName1"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ >
<span v-for="(item, index) in btList" :key="index">
- <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+ <el-option
+ :label="item.field"
+ :value="item.field"
+ v-if="!item.hide"
+ ></el-option>
</span>
</el-select>
</el-col>
- <el-col :span="6" style="padding: 0 10px;">
- <el-select v-model="queryParams.Comparator1" placeholder="璇烽�夋嫨" @change="riqiChange">
- <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
- :value="item.value"></el-option>
+ <el-col :span="6" style="padding: 0 10px">
+ <el-select
+ v-model="queryParams.Comparator1"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ >
+ <el-option
+ v-for="(item, index) in comparatorList"
+ :key="index"
+ :label="item.label"
+ :value="item.value"
+ ></el-option>
</el-select>
</el-col>
<el-col :span="11">
- <el-input v-model="queryParams.ColContent1" placeholder="璇疯緭鍏�" clearable
- @keyup.enter.native="handleQuery" />
+ <el-input
+ v-model="queryParams.ColContent1"
+ placeholder="璇疯緭鍏�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
</el-col>
</el-row>
</el-form-item>
@@ -66,22 +135,42 @@
<el-form-item label-width="0">
<el-row>
<el-col :span="7">
- <el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <el-select
+ v-model="queryParams.ColName2"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ >
<span v-for="(item, index) in btList" :key="index">
- <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+ <el-option
+ :label="item.field"
+ :value="item.field"
+ v-if="!item.hide"
+ ></el-option>
</span>
</el-select>
</el-col>
- <el-col :span="6" style="padding: 0 10px;">
- <el-select v-model="queryParams.Comparator2" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <el-col :span="6" style="padding: 0 10px">
+ <el-select
+ v-model="queryParams.Comparator2"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ >
<span v-for="(item, index) in btList" :key="index">
- <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+ <el-option
+ :label="item.field"
+ :value="item.field"
+ v-if="!item.hide"
+ ></el-option>
</span>
</el-select>
</el-col>
<el-col :span="11">
- <el-input v-model="queryParams.ColContent2" placeholder="璇疯緭鍏�" clearable
- @keyup.enter.native="handleQuery" />
+ <el-input
+ v-model="queryParams.ColContent2"
+ placeholder="璇疯緭鍏�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
</el-col>
</el-row>
</el-form-item>
@@ -89,20 +178,40 @@
<el-form-item label-width="0">
<el-row>
<el-col :span="7">
- <el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" @change="riqiChange">
- <el-option v-for="(item, index) in btList" :key="index" :label="item.field"
- :value="item.field"></el-option>
+ <el-select
+ v-model="queryParams.ColName"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ >
+ <el-option
+ v-for="(item, index) in btList"
+ :key="index"
+ :label="item.field"
+ :value="item.field"
+ ></el-option>
</el-select>
</el-col>
- <el-col :span="6" style="padding: 0 10px;">
- <el-select v-model="queryParams.Comparator" placeholder="璇烽�夋嫨" @change="riqiChange">
- <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
- :value="item.value"></el-option>
+ <el-col :span="6" style="padding: 0 10px">
+ <el-select
+ v-model="queryParams.Comparator"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ >
+ <el-option
+ v-for="(item, index) in comparatorList"
+ :key="index"
+ :label="item.label"
+ :value="item.value"
+ ></el-option>
</el-select>
</el-col>
<el-col :span="11">
- <el-input v-model="queryParams.ColContent" placeholder="璇疯緭鍏�" clearable
- @keyup.enter.native="handleQuery" />
+ <el-input
+ v-model="queryParams.ColContent"
+ placeholder="璇疯緭鍏�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
</el-col>
</el-row>
</el-form-item>
@@ -111,78 +220,196 @@
</el-collapse-item>
</el-collapse>
</el-form>
- <el-row :gutter="10" class="mb8" style="margin-top: 10px;">
+ <el-row :gutter="10" class="mb8" style="margin-top: 10px">
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddEdit(OperationType = 1)"
- id="btn-Add">鏂板</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleAddEdit((OperationType = 1))"
+ id="btn-Add"
+ >鏂板</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="handleEdit(row = rowForm, OperationType = 3)">缂栬緫</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="handleEdit((row = rowForm), (OperationType = 3))"
+ >缂栬緫</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-document-copy" size="mini" :disabled="single"
- @click="handleEdit(row = rowForm, OperationType = 1, copyType = 1)">澶嶅埗</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-document-copy"
+ size="mini"
+ :disabled="single"
+ @click="handleEdit((row = rowForm), (OperationType = 1), (copyType = 1))"
+ >澶嶅埗</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
+ <el-button
+ type="primary"
+ icon="el-icon-delete"
+ size="mini"
+ :disabled="single"
+ @click="handleDelete"
+ >鍒犻櫎
</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
- @click="set_CheckBill(0, form = rowForm)">瀹℃牳</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit-outline"
+ size="mini"
+ :disabled="single"
+ @click="set_CheckBill(0, (form = rowForm))"
+ >瀹℃牳</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
- @click="set_CheckBill(1, form = rowForm)">杩斿鏍�</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit-outline"
+ size="mini"
+ :disabled="single"
+ @click="set_CheckBill(1, (form = rowForm))"
+ >杩斿鏍�</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-download"
+ size="mini"
+ @click="handleExport"
+ >瀵煎嚭</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-date" size="mini" @click="handleRowHide">闅愯棌鍒楄缃�</el-button>
+ <el-button type="primary" icon="el-icon-date" size="mini" @click="handleRowHide"
+ >闅愯棌鍒楄缃�</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-printer" size="mini" @click="get_PrintReport">鎵撳嵃</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-printer"
+ size="mini"
+ @click="get_PrintReport"
+ >鎵撳嵃</el-button
+ >
</el-col>
</el-row>
<div class="tableBox" v-loading="loading">
- <el-table :data="tableData" ref="tableData" max-height="710" :summary-method="getSummaries"
- @selection-change="handleSelectionChange" show-summary border @row-click="handleRowClick" :row-style="rowStyle"
- @cell-dblclick="handleDblclick" v-if="tableShow">
+ <el-table
+ :data="tableData"
+ ref="tableData"
+ max-height="710"
+ :summary-method="getSummaries"
+ @selection-change="handleSelectionChange"
+ show-summary
+ border
+ @row-click="handleRowClick"
+ :row-style="rowStyle"
+ @cell-dblclick="handleDblclick"
+ v-if="tableShow"
+ >
<template v-for="(item, index) in btList">
- <el-table-column type="selection" width="55" align="center" :fixed="item.fixed" v-if="item.type == 'checkbox'"
- :key="index" />
- <el-table-column :align="item.align" :prop="item.field" :label="item.title" :width="item.width" :key="item.id"
- v-else-if="!item.hide && item.type != 'checkbox'" :sortable="item.sort" show-overflow-tooltip
- :fixed="item.fixed">
- <template slot-scope="{row, column }">
+ <el-table-column
+ type="selection"
+ width="55"
+ align="center"
+ :fixed="item.fixed"
+ v-if="item.type == 'checkbox'"
+ :key="index"
+ />
+ <el-table-column
+ :align="item.align"
+ :prop="item.field"
+ :label="item.title"
+ :width="item.width"
+ :key="item.id"
+ v-else-if="!item.hide && item.type != 'checkbox'"
+ :sortable="item.sort"
+ show-overflow-tooltip
+ :fixed="item.fixed"
+ >
+ <template slot-scope="{ row, column }">
<el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
<div :style="item.style">
- <span v-if="column.property.includes('鏃ユ湡')">{{ parseTime(row[column.property], '{y}-{m}-{d}') }}</span>
- <el-button type="text" @click="handleEdit(row, OperationType = 3)"
- v-else-if="column.property == '鍗曟嵁鍙�'">{{
- row.鍗曟嵁鍙�
- }}</el-button>
+ <span v-if="column.property.includes('鏃ユ湡')">{{
+ parseTime(row[column.property], "{y}-{m}-{d}")
+ }}</span>
+ <el-button
+ type="text"
+ @click="handleEdit(row, (OperationType = 3))"
+ v-else-if="column.property == '鍗曟嵁鍙�'"
+ >{{ row.鍗曟嵁鍙� }}</el-button
+ >
<span v-else>{{ row[column.label] }}</span>
</div>
</template>
</el-table-column>
</template>
</el-table>
- <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" :pageSizes="pageSizes" @pagination="getList" />
- <el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
- <RowSettings :colName="btResList" HModName="Kf_SellOutBillList" @rowEditClose="rowSetClose"
- v-if="rowHideShow" />
+ <pagination
+ v-show="total > 0"
+ :total="total"
+ :page.sync="page"
+ :limit.sync="pageSize"
+ :pageSizes="pageSizes"
+ @pagination="getList"
+ />
+ <el-dialog
+ title="闅愯棌鍒楄缃�"
+ :visible.sync="openRowHide"
+ width="816px"
+ append-to-body
+ >
+ <RowSettings
+ :colName="btResList"
+ HModName="Kf_SellOutBillList"
+ @rowEditClose="rowSetClose"
+ v-if="rowHideShow"
+ />
</el-dialog>
<!-- 缂栬緫 -->
- <el-dialog title="缂栬緫閿�鍞嚭搴撳崟" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
- <edit :OperationType=OperationType :linterid=this.rowForm.hmainid :HSouceBillType=this.rowForm.HSourceBillType
- :copyType="copyType" @editClose="editClose" v-if="editShow" />
+ <el-dialog
+ title="缂栬緫閿�鍞嚭搴撳崟"
+ :visible.sync="openEdit"
+ width="1480px"
+ append-to-body
+ class="xsckdBox"
+ @close="close"
+ >
+ <edit
+ :OperationType="OperationType"
+ :linterid="this.rowForm.hmainid"
+ :HSouceBillType="this.rowForm.HSourceBillType"
+ :copyType="copyType"
+ @editClose="editClose"
+ v-if="editShow"
+ />
</el-dialog>
- <el-dialog title="鎵撳嵃妯℃澘閫夋嫨" :visible.sync="openPrintList" width="800px" append-to-body>
- <PrintList :linterid=this.rowForm.hmainid :MyMsg=this.rowForm.hmainid Type='Kf_SellOutBillList'
- HModName='Kf_SellOutBillList' @rowEditClose="rowSetClose" v-if="printListShow" />
+ <el-dialog
+ title="鎵撳嵃妯℃澘閫夋嫨"
+ :visible.sync="openPrintList"
+ width="800px"
+ append-to-body
+ >
+ <PrintList
+ :linterid="this.rowForm.hmainid"
+ :MyMsg="this.rowForm.hmainid"
+ Type="Kf_SellOutBillList"
+ HModName="Kf_SellOutBillList"
+ @rowEditClose="rowSetClose"
+ v-if="printListShow"
+ />
<!-- <div>111</div> -->
</el-dialog>
</div>
@@ -190,18 +417,18 @@
</template>
<script>
-import axios from 'axios'
-import RowSettings from '@/views/component/rowSettings'
-import Edit from '@/views/sell/sellOut/sellOutBillEdit'
-import PrintList from '@/views/component/printList'
-import moment from 'moment';
+import axios from "axios";
+import RowSettings from "@/views/component/rowSettings";
+import Edit from "@/views/sell/sellOut/sellOutBillEdit";
+import PrintList from "@/views/component/printList";
+import moment from "moment";
export default {
- name: 'SellOutBill',
+ name: "SellOutBill",
components: { RowSettings, Edit, PrintList },
data() {
return {
- activeSeach: '',
+ activeSeach: "",
editShow: false,
openEdit: false,
totalNameList: [],
@@ -214,36 +441,36 @@
openRowHide: false,
copyType: 0,
comparatorList: [
- { label: '=', value: '=' },
- { label: '>=', value: '>=' },
- { label: '>', value: '>' },
- { label: '<=', value: '<=' },
- { label: '<', value: '<' },
- { label: '<>', value: '<>' },
- { label: '鍖呭惈', value: '7' },
- { label: '宸﹀寘鍚�', value: '8' },
- { label: '鍙冲寘鍚�', value: '9' },
- { label: '涓嶅寘鍚�', value: '10' },
+ { label: "=", value: "=" },
+ { label: ">=", value: ">=" },
+ { label: ">", value: ">" },
+ { label: "<=", value: "<=" },
+ { label: "<", value: "<" },
+ { label: "<>", value: "<>" },
+ { label: "鍖呭惈", value: "7" },
+ { label: "宸﹀寘鍚�", value: "8" },
+ { label: "鍙冲寘鍚�", value: "9" },
+ { label: "涓嶅寘鍚�", value: "10" },
],
- sWhere: '',
- sTime: '',
- eTime: '',
+ sWhere: "",
+ sTime: "",
+ eTime: "",
rqsgList: [
- { label: '浠婂ぉ', value: 0 },
- { label: '杩戜袱澶�', value: 1 },
- { label: '杩戜笁澶�', value: 2 },
- { label: '杩戝洓澶�', value: 3 },
- { label: '杩戜簲澶�', value: 4 },
- { label: '杩戝叚澶�', value: 5 },
- { label: '杩戜竷澶�', value: 6 },
- { label: '杩�30澶�', value: 29 },
- { label: '杩戝崐骞�', value: 180 },
- { label: '杩戜竴骞�', value: 365 },
+ { label: "浠婂ぉ", value: 0 },
+ { label: "杩戜袱澶�", value: 1 },
+ { label: "杩戜笁澶�", value: 2 },
+ { label: "杩戝洓澶�", value: 3 },
+ { label: "杩戜簲澶�", value: 4 },
+ { label: "杩戝叚澶�", value: 5 },
+ { label: "杩戜竷澶�", value: 6 },
+ { label: "杩�30澶�", value: 29 },
+ { label: "杩戝崐骞�", value: 180 },
+ { label: "杩戜竴骞�", value: 365 },
],
- hPriceTypeList: ['鎴愭湰浠�', '缁撶畻浠�'],
+ hPriceTypeList: ["鎴愭湰浠�", "缁撶畻浠�"],
addBtnShow: false,
- dialogTitle: '',
- OperationType: null,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+ dialogTitle: "",
+ OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
baseURL: process.env.VUE_APP_BASE_API,
lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
@@ -256,21 +483,21 @@
open: false,
// 鏌ヨ鍙傛暟
queryParams: {
- HBillNo: '',
+ HBillNo: "",
HInitTimeCycle: 29,
- HProjectNumber: '',
+ HProjectNumber: "",
HCusID: null,
- HMaterNumber: '',
- HMaterName: '',
- ColName1: '',
- ColName2: '',
- ColName: '',
- Comparator1: '',
- Comparator2: '',
- Comparator: '',
- ColContent1: '',
- ColContent2: '',
- ColContent: '',
+ HMaterNumber: "",
+ HMaterName: "",
+ ColName1: "",
+ ColName2: "",
+ ColName: "",
+ Comparator1: "",
+ Comparator2: "",
+ Comparator: "",
+ ColContent1: "",
+ ColContent2: "",
+ ColContent: "",
},
// 閫変腑鏁扮粍
ids: [],
@@ -280,12 +507,27 @@
multiple: true,
// 閬僵灞�
loading: true,
- tyResList: [],//閿�鍞嚭搴撳垪琛紙鎺ュ彛鏁版嵁锛�
- btList: [],//閿�鍞嚭搴撹〃澶村垪琛ㄦ樉绀�
+ tyResList: [], //閿�鍞嚭搴撳垪琛紙鎺ュ彛鏁版嵁锛�
+ btList: [], //閿�鍞嚭搴撹〃澶村垪琛ㄦ樉绀�
btResList: [],
- tableData: [],//閿�鍞嚭搴撳垪琛�(鍒嗛〉鏄剧ず)
+ tableData: [], //閿�鍞嚭搴撳垪琛�(鍒嗛〉鏄剧ず)
dataList: [],
- titleData: ["hmainid", "hsupid", "HEmpID", "hmanagerid", "hsecmanagerid", "鍙戣揣浜�", "hkeeperid", "淇濈鍛�", "HDeptID", "閿�鍞柟寮�", "hsubid", "hmaterid", "hunitid", "HWHID"],//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ titleData: [
+ "hmainid",
+ "hsupid",
+ "HEmpID",
+ "hmanagerid",
+ "hsecmanagerid",
+ "鍙戣揣浜�",
+ "hkeeperid",
+ "淇濈鍛�",
+ "HDeptID",
+ "閿�鍞柟寮�",
+ "hsubid",
+ "hmaterid",
+ "hunitid",
+ "HWHID",
+ ], //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
pageSizes: [50, 100, 500, 5000, 50000],
page: 1,
pageSize: 0,
@@ -294,7 +536,7 @@
},
created() {
// this.fetchData()
- this.riqiChange()
+ this.riqiChange();
this.getList();
},
@@ -304,12 +546,12 @@
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
- sums[index] = '鍚堣';
+ sums[index] = "鍚堣";
return;
}
- const values = data.map(item => Number(item[column.property]));
+ const values = data.map((item) => Number(item[column.property]));
if (this.totalNameList[index].totalRow) {
- if (!values.every(value => isNaN(value))) {
+ if (!values.every((value) => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
@@ -317,10 +559,9 @@
} else {
return prev;
}
- }, 0)
-
+ }, 0);
} else {
- sums[index] = '';
+ sums[index] = "";
}
}
}, 1000);
@@ -328,253 +569,296 @@
},
handleBtnHide() {
- this.btnHideShow = true
- this.openBtnHide = true
+ this.btnHideShow = true;
+ this.openBtnHide = true;
},
handleRowHide() {
- this.rowHideShow = true
- this.openRowHide = true
+ this.rowHideShow = true;
+ this.openRowHide = true;
},
rowSetClose(val) {
- this.rowHideShow = false
- this.tableShow = true
- this.openRowHide = val
- this.getList()
+ this.rowHideShow = false;
+ this.tableShow = true;
+ this.openRowHide = val;
+ this.getList();
},
riqiChange() {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
const yyyyS = start.getFullYear();
- const mmS = String(start.getMonth() + 1).padStart(2, '0'); // 鏈堜唤鏄粠0寮�濮嬬殑
- const ddS = String(start.getDate()).padStart(2, '0');
+ const mmS = String(start.getMonth() + 1).padStart(2, "0"); // 鏈堜唤鏄粠0寮�濮嬬殑
+ const ddS = String(start.getDate()).padStart(2, "0");
const yyyyE = end.getFullYear();
- const mmE = String(end.getMonth() + 1).padStart(2, '0'); // 鏈堜唤鏄粠0寮�濮嬬殑
- const ddE = String(end.getDate()).padStart(2, '0');
- this.sTime = yyyyS + '-' + mmS + '-' + ddS
- this.eTime = yyyyE + '-' + mmE + '-' + ddE
+ const mmE = String(end.getMonth() + 1).padStart(2, "0"); // 鏈堜唤鏄粠0寮�濮嬬殑
+ const ddE = String(end.getDate()).padStart(2, "0");
+ this.sTime = yyyyS + "-" + mmS + "-" + ddS;
+ this.eTime = yyyyE + "-" + mmE + "-" + ddE;
},
getList() {
- this.pageSize = 50
- this.tableShow = false
- this.loading = true
+ this.pageSize = 50;
+ this.tableShow = false;
+ this.loading = true;
if (this.sTime) {
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'"
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'"
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
}
if (this.pageSize == 0) {
- this.pageSize = 50
+ this.pageSize = 50;
}
// 閿�鍞嚭搴撳崟鍒楄〃
- axios.get(this.baseURL + '/Kf_SellOutBill/GetSellOutBillList_byPage', {
- params: {
- "sWhere": this.sWhere,
- "user": sessionStorage["HUserName"],
- "Organization": sessionStorage["Organization"],
- "page": this.page,
- "size": this.pageSize
- },
- }).then(response => {
- this.tyResList = response.data.data//鎬绘暟鎹�
- let data1 = response.data
- let option = []
- if (data1.code == 1) {
- this.btResList = data1.list//閿�鍞嚭搴撳崟鎺ュ彛琛ㄥご鏁版嵁
- this.total = data1.count;
- var data = [];//鍒楀瓧娈垫暟鎹�
- var col = [];
- var totalArray = ["浠舵暟"];
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
- data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
- }
- //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
- for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
- if (this.titleData.indexOf(data[i].name) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑 //璁＄畻鍒�
- col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- } else if (totalArray.indexOf(data[i].name) > -1 || (data[i].Type == "Decimal" || data[i].Type == "Int32")) { //璁＄畻鍒�
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ axios
+ .get(this.baseURL + "/Kf_SellOutBill/GetSellOutBillList_byPage", {
+ params: {
+ sWhere: this.sWhere,
+ user: sessionStorage["HUserName"],
+ Organization: sessionStorage["Organization"],
+ page: this.page,
+ size: this.pageSize,
+ },
+ })
+ .then((response) => {
+ this.tyResList = response.data.data; //鎬绘暟鎹�
+ let data1 = response.data;
+ let option = [];
+ if (data1.code == 1) {
+ this.btResList = data1.list; //閿�鍞嚭搴撳崟鎺ュ彛琛ㄥご鏁版嵁
+ this.total = data1.count;
+ var data = []; //鍒楀瓧娈垫暟鎹�
+ var col = [];
+ var totalArray = ["浠舵暟"];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ //寰簭閬嶅巻鏁扮粍
+ data.push({
+ id: data1.list[key].ColmCols,
+ name: data1.list[key].ColmCols,
+ Type: data1.list[key].ColmType,
+ }); //浠庢瘡涓璞′腑鎻愬彇鏁版嵁
}
- else {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: "checkbox", fixed: "left", totalRowText: "鍚堣" });
+ for (var i = 0; i < data.length; i++) {
+ //閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+ if (this.titleData.indexOf(data[i].name) > -1) {
+ //妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑 //璁＄畻鍒�
+ col.push({
+ field: data[i].id,
+ title: data[i].name,
+ align: "center",
+ hide: true,
+ }); //闅愯棌id鍒�
+ } else if (
+ totalArray.indexOf(data[i].name) > -1 ||
+ data[i].Type == "Decimal" ||
+ data[i].Type == "Int32"
+ ) {
+ //璁＄畻鍒�
+ col.push({
+ field: data[i].id,
+ title: data[i].name,
+ align: "center",
+ sort: true,
+ totalRow: true,
+ width: 120,
+ });
+ } else {
+ col.push({
+ field: data[i].id,
+ title: data[i].name,
+ align: "center",
+ sort: true,
+ width: 200,
+ });
+ }
+ }
+ option.cols = [col];
+ this.dataList = option;
+ option.data = data1.data;
+ var result = data1.data;
+ var temp = "";
+ for (var i = 0; i < result.length; i++) {
+ if (temp != result[i]["hmainid"]) {
+ temp = result[i]["hmainid"];
+ } else {
+ result[i].鏃ユ湡 = null;
+ result[i].鍗曟嵁鍙� = "";
+ /*result[i].鐘舵�� = "";*/
+ result[i].绾㈣摑鍗曟爣璁� = "";
+ result[i].hsupid = "";
+ result[i].瀹㈡埛 = "";
+ result[i].HEmpID = "";
+ result[i].涓氬姟鍛� = "";
+ result[i].hmanagerid = "";
+ result[i].涓荤 = "";
+ result[i].hsecmanagerid = "";
+ result[i].鍙戣揣浜� = "";
+ result[i].hkeeperid = "";
+ result[i].淇濈鍛� = "";
+ result[i].HDeptID = "";
+ result[i].閮ㄩ棬 = "";
+ result[i].閿�鍞柟寮� = "";
+ }
}
+ option.data = result;
+ let HModName = "Kf_SellOutBillList";
+ this.DisPlay_HideColumn(
+ HModName,
+ sessionStorage["HUserName"],
+ option,
+ this.dataList
+ );
}
- option.cols = [col]
- this.dataList = option
- option.data = data1.data;
- var result = data1.data;
- var temp = "";
- for (var i = 0; i < result.length; i++) {
- if (temp != result[i]["hmainid"]) {
- temp = result[i]["hmainid"];
- } else {
- result[i].鏃ユ湡 = null;
- result[i].鍗曟嵁鍙� = "";
- /*result[i].鐘舵�� = "";*/
- result[i].绾㈣摑鍗曟爣璁� = "";
- result[i].hsupid = "";
- result[i].瀹㈡埛 = "";
- result[i].HEmpID = "";
- result[i].涓氬姟鍛� = "";
- result[i].hmanagerid = "";
- result[i].涓荤 = "";
- result[i].hsecmanagerid = "";
- result[i].鍙戣揣浜� = "";
- result[i].hkeeperid = "";
- result[i].淇濈鍛� = "";
- result[i].HDeptID = "";
- result[i].閮ㄩ棬 = "";
- result[i].閿�鍞柟寮� = "";
- }
- }
-
- option.data = result;
- let HModName = "Kf_SellOutBillList"
- this.DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, this.dataList);
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
},
DisPlay_HideColumn(HModName, user, option, dataOption) {
-
- this.totalNameList = []
- axios.get(this.baseURL + '/Xt_grdAlignment_WMES/grdAlignmentWMESList', {
- params: {
- "HModName": HModName,
- "user": user,
- },
- }).then(res => {
- let data1 = res.data
- if (data1.data.length != 0) {
- var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
- newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
- dataCol = data1.data[0].HGridString.split(',');
- //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
- if (dataCol.length == option.cols[0].length - 1) {
- //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
- for (var j = 0; j < option.cols[0].length - 1; j++) {
- for (var i = 0; i < option.cols[0].length - 1; i++) {
- var dataCols = dataCol[j].split('|');
- //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
- if (option.cols[0][i + 1]["field"] == dataCols[5]) {
- //闅愯棌鍒�
- if (dataCols[1] == 1) {
- option.cols[0][i + 1]["hide"] = true;
+ this.totalNameList = [];
+ axios
+ .get(this.baseURL + "/Xt_grdAlignment_WMES/grdAlignmentWMESList", {
+ params: {
+ HModName: HModName,
+ user: user,
+ },
+ })
+ .then((res) => {
+ let data1 = res.data;
+ if (data1.data.length != 0) {
+ var dataCol = []; //鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var newCols = [[]]; //瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+ newCols[0].push(option.cols[0][0]); //鏀惧叆绗竴涓猚heckbox
+ dataCol = data1.data[0].HGridString.split(",");
+ //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+ if (dataCol.length == option.cols[0].length - 1) {
+ //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+ for (var j = 0; j < option.cols[0].length - 1; j++) {
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[j].split("|");
+ //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+ if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] =
+ "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //鏄剧ず鍒�
+ if (
+ dataCols[1] == 0 &&
+ this.titleData.indexOf(option.cols[0][i + 1]["title"]) == -1
+ ) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //缁熻鍒�
+ if (dataCols[6] == 1) {
+ option.cols[0][i + 1]["totalRow"] = true;
+ } else {
+ option.cols[0][i + 1]["totalRow"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ newCols[0].push(option.cols[0][i + 1]);
+ break;
}
- //璁剧疆鍒楀
- if (dataCols[3] > 0) {
- option.cols[0][i + 1]["width"] = dataCols[3];
- }
- //璁剧疆鍐呭瀛椾綋澶у皬
- if (data1.data[0].HFontSize != 0) {
- option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
- } else {
- option.cols[0][i + 1]["style"] = "font-size:100%";
- }
- //鏄剧ず鍒�
- if (dataCols[1] == 0 && this.titleData.indexOf(option.cols[0][i + 1]["title"]) == -1) {
- option.cols[0][i + 1]["hide"] = false;
- }
- //缁熻鍒�
- if (dataCols[6] == 1) {
- option.cols[0][i + 1]["totalRow"] = true;
- } else {
- option.cols[0][i + 1]["totalRow"] = false;
- }
- //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
- switch (dataCols[2]) {
- case "L":
- option.cols[0][i + 1]["align"] = "left";
- break;
- case "M":
- option.cols[0][i + 1]["align"] = "center";
- break;
- case "R":
- option.cols[0][i + 1]["align"] = "right";
- break;
- }
- //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
- if (dataCols[4] != null && dataCols[4] != "") {
- option.cols[0][i + 1]["title"] = dataCols[4];
- }
- newCols[0].push(option.cols[0][i + 1]);
- break;
}
}
- }
- //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
- if (dataCol.length == newCols[0].length - 1) {
- option.cols = newCols;
- //鍙栨秷鍐荤粨鍒�
- for (var i = 1; i < option.cols[0].length - 1; i++) {
- if (option.cols[0][i + 1]["fixed"] != null) {
- option.cols[0][i + 1]["fixed"] = null;
- }
- else {
- break;
- }
- }
- //鍐荤粨鍒�
- if (data1.data[0].HFixCols != 0) {
- for (var i = 0; i < data1.data[0].HFixCols; i++) {
- if (dataOption.cols[0].indexOf(option.cols[0][i + 1]["title"]) != -1) {
- data1.data[0].HFixCols += 1;
+ //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+ if (dataCol.length == newCols[0].length - 1) {
+ option.cols = newCols;
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i + 1]["fixed"] != null) {
+ option.cols[0][i + 1]["fixed"] = null;
+ } else {
+ break;
}
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if (
+ dataOption.cols[0].indexOf(option.cols[0][i + 1]["title"]) != -1
+ ) {
+ data1.data[0].HFixCols += 1;
+ }
- option.cols[0][i + 1]["fixed"] = "left";
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
}
- }
- //璁剧疆鍒楁帓搴�
- for (var i = 1; i < option.cols[0].length; i++) {
- if (data1.data[0].HSortFlag == "鏄�") {
- option.cols[0][i]["sort"] = true;
- }
- else {
- option.cols[0][i]["sort"] = false;
+ //璁剧疆鍒楁帓搴�
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (data1.data[0].HSortFlag == "鏄�") {
+ option.cols[0][i]["sort"] = true;
+ } else {
+ option.cols[0][i]["sort"] = false;
+ }
}
}
}
- }
- this.btList = option.cols[0]
- this.btList.map(item => {
- if (!item.hide) {
- this.totalNameList.push(item)
+ this.btList = option.cols[0];
+ this.btList.map((item) => {
+ if (!item.hide) {
+ this.totalNameList.push(item);
+ }
+ });
+ if (data1.data[0].HPageSize == 0) {
+ this.pageSize = 50;
+ } else {
+ this.pageSize = data1.data[0].HPageSize;
}
- })
- if (data1.data[0].HPageSize == 0) {
- this.pageSize = 50
+ this.tableData = option.data;
+ this.tableShow = true;
+ this.loading = false;
} else {
- this.pageSize = data1.data[0].HPageSize
+ this.btList = dataOption.cols[0];
+ this.btList.map((item) => {
+ if (!item.hide) {
+ this.totalNameList.push(item);
+ }
+ });
+ this.tableData = dataOption.data;
+ this.tableShow = true;
+ this.loading = false;
}
- this.tableData = option.data
- this.tableShow = true
- this.loading = false
- } else {
- this.btList = dataOption.cols[0]
- this.btList.map(item => {
- if (!item.hide) {
- this.totalNameList.push(item)
- }
- })
- this.tableData = dataOption.data
- this.tableShow = true
- this.loading = false
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
},
- renderHeader(h, { column, $index }) {// 鏂板缓涓�涓� span
- let span = document.createElement(span)// 璁剧疆琛ㄥご鍚嶇О
- span.innerText = column.label
+ renderHeader(h, { column, $index }) {
+ // 鏂板缓涓�涓� span
+ let span = document.createElement(span); // 璁剧疆琛ㄥご鍚嶇О
+ span.innerText = column.label;
//涓存椂鎻掑叆 document
- document.body.appendChild(span)// 閲嶇偣:鑾峰彇 span 鏈�灏忓搴︼紝璁剧疆褰撳墠鍒楋紝娉ㄦ剰杩欓噷鍔犱簡 20锛屽瓧娈佃緝澶氭椂column.minWidth=span.getBoundingClientRect().width + 50.//绉婚櫎 document 涓复鏃剁殑 span
- document.body.removeChild(span)
- return h(span, column.label)
+ document.body.appendChild(span); // 閲嶇偣:鑾峰彇 span 鏈�灏忓搴︼紝璁剧疆褰撳墠鍒楋紝娉ㄦ剰杩欓噷鍔犱簡 20锛屽瓧娈佃緝澶氭椂column.minWidth=span.getBoundingClientRect().width + 50.//绉婚櫎 document 涓复鏃剁殑 span
+ document.body.removeChild(span);
+ return h(span, column.label);
},
//鐐瑰嚮琛�
handleRowClick(row, column, event) {
@@ -586,27 +870,27 @@
//閫変腑琛岄珮浜牱寮�
rowStyle({ row, rowIndex }) {
if (this.ids.includes(row.hmainid)) {
- return { "background": "#ecf5ff" }
+ return { background: "#ecf5ff" };
}
},
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
- this.OperationType = 3
- this.handleEdit()
+ this.OperationType = 3;
+ this.handleEdit();
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
// this.rowForm = {}
- this.ids = selection.map(item => item.hmainid)
- this.single = selection.length != 1
- this.multiple = !selection.length
+ this.ids = selection.map((item) => item.hmainid);
+ this.single = selection.length != 1;
+ this.multiple = !selection.length;
if (!this.single) {
- this.rowForm = selection[0]
+ this.rowForm = selection[0];
}
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
- this.sWhere = ''
+ this.sWhere = "";
if (this.queryParams.ColName && this.queryParams.Comparator) {
var com = "";
switch (this.queryParams.Comparator) {
@@ -623,7 +907,8 @@
com = "not like'%" + this.queryParams.ColContent + "%'";
break;
default:
- com = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+ com =
+ "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
break;
}
this.sWhere += " and " + this.queryParams.ColName + " " + com;
@@ -644,7 +929,12 @@
com1 = "not like'%" + this.queryParams.ColContent1 + "%'";
break;
default:
- com1 = "" + this.queryParams.Comparator1 + "'" + this.queryParams.ColContent1 + "'";
+ com1 =
+ "" +
+ this.queryParams.Comparator1 +
+ "'" +
+ this.queryParams.ColContent1 +
+ "'";
break;
}
this.sWhere += " and " + this.queryParams.ColName1 + " " + com1;
@@ -665,16 +955,23 @@
com2 = "not like'%" + this.queryParams.ColContent2 + "%'";
break;
default:
- com2 = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+ com2 =
+ "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
break;
}
this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
}
if (this.sTime) {
- this.sTime = moment(this.sTime).format('YYYY-MM-DD')
- this.eTime = moment(this.eTime).format('YYYY-MM-DD')
- console.log(this.sTime, this.eTime)
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'" + " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
+ this.sTime = moment(this.sTime).format("YYYY-MM-DD");
+ this.eTime = moment(this.eTime).format("YYYY-MM-DD");
+ console.log(this.sTime, this.eTime);
+ this.sWhere +=
+ " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" +
+ this.sTime +
+ "'" +
+ " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" +
+ this.eTime +
+ "'";
}
if (this.queryParams.HBillNo) {
this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
@@ -691,130 +988,146 @@
if (this.queryParams.HMaterName) {
this.sWhere += " and 鐗╂枡鍚嶇О like '%" + this.queryParams.HMaterName + "%'";
}
- this.getList()
+ this.getList();
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
- this.sWhere = ''
+ this.sWhere = "";
this.queryParams = {
- HBillNo: '',
+ HBillNo: "",
HInitTimeCycle: 29,
- HProjectNumber: '',
+ HProjectNumber: "",
HCusID: null,
- HMaterNumber: '',
- HMaterName: '',
- ColName1: '',
- ColName2: '',
- ColName: '',
- Comparator1: '',
- Comparator2: '',
- Comparator: '',
- ColContent1: '',
- ColContent2: '',
- ColContent: '',
- }
- this.riqiChange()
- this.resetForm("queryForm")
- this.getList()
+ HMaterNumber: "",
+ HMaterName: "",
+ ColName1: "",
+ ColName2: "",
+ ColName: "",
+ Comparator1: "",
+ Comparator2: "",
+ Comparator: "",
+ ColContent1: "",
+ ColContent2: "",
+ ColContent: "",
+ };
+ this.riqiChange();
+ this.resetForm("queryForm");
+ this.getList();
},
//閫�鍑�
close() {
// this.reset()
- this.tableShow = true
- this.openEdit = false
- this.editShow = false
- this.getList()
+ this.tableShow = true;
+ this.openEdit = false;
+ this.editShow = false;
+ this.getList();
},
//鎵撳紑鏂板缁勪欢寮圭獥
handleAddEdit() {
- this.rowForm.hmainid = 0
- this.editShow = true
- this.openEdit = true
+ this.rowForm.hmainid = 0;
+ this.editShow = true;
+ this.openEdit = true;
},
//鎵撳紑淇敼缁勪欢寮圭獥
handleEdit(row) {
- this.rowForm = row
- this.editShow = true
- this.openEdit = true
+ this.rowForm = row;
+ this.editShow = true;
+ this.openEdit = true;
},
//鍏抽棴缂栬緫椤甸潰
editClose(val) {
- this.open = val
- this.editShow = false
- this.openEdit = val
- this.getList()
+ this.open = val;
+ this.editShow = false;
+ this.openEdit = val;
+ this.getList();
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
- this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
- if (this.rowForm.鐘舵�� == "鍒涘缓") {
- axios.get(this.baseURL + "/Kf_SellOutBill/DeltetSellOutBill", {
- params: { 'HInterID': this.rowForm.hmainid.toString(), 'user': sessionStorage["HUserName"] }
- }).then(response => {
- if (response.data.count == 1) {
- this.getList()
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
- } else {
- this.$modal.msgError("閿欒:" + result.code + result.Message);
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- } else {
- this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
- }
- }).catch(() => { })
+ this.$modal
+ .confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
+ .then(() => {
+ if (this.rowForm.鐘舵�� == "鍒涘缓") {
+ axios
+ .get(this.baseURL + "/Kf_SellOutBill/DeltetSellOutBill", {
+ params: {
+ HInterID: this.rowForm.hmainid.toString(),
+ user: sessionStorage["HUserName"],
+ },
+ })
+ .then((response) => {
+ if (response.data.count == 1) {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ } else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message);
+ }
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ } else {
+ this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
+ }
+ })
+ .catch(() => {});
},
// 鍙嶅鏍�/瀹℃牳鏁版嵁
set_CheckBill(num, form) {
- var InterID = form.hmainid || form.HInterID
+ var InterID = form.hmainid || form.HInterID;
//閫昏緫瀹℃牳鏂规硶
- axios.get(this.baseURL + "/Kf_SellOutBill/AuditKf_SellOutBill", {
- params: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
- }).then(response => {
- let result = response.data
- if (result.code == 1) {
- this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
- this.getList();
- }
- else {
- this.$modal.msgError("閿欒:" + result.code + result.Message,);
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
+ axios
+ .get(this.baseURL + "/Kf_SellOutBill/AuditKf_SellOutBill", {
+ params: {
+ HInterID: InterID,
+ IsAudit: num,
+ CurUserName: sessionStorage["HUserName"],
+ },
+ })
+ .then((response) => {
+ let result = response.data;
+ if (result.code == 1) {
+ this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ this.getList();
+ } else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message);
+ }
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
},
//瀵煎嚭
handleExport() {
const ws = this.$XLSX.utils.json_to_sheet(this.tyResList); // 灏嗘暟鎹浆鎹负宸ヤ綔琛�
const wb = this.$XLSX.utils.book_new(); // 鍒涘缓涓�涓柊鐨勫伐浣滅翱
this.$XLSX.utils.book_append_sheet(wb, ws, "Sheet1"); // 灏嗗伐浣滆〃娣诲姞鍒板伐浣滅翱涓紝骞跺懡鍚嶄负"Sheet1"
- this.$XLSX.writeFile(wb, `sellOutBill_${new Date().getTime()}.xlsx`); // 瀵煎嚭鏂囦欢
+ this.$XLSX.writeFile(wb, `sellOutBill_${new Date().getTime()}.xlsx`); // 瀵煎嚭鏂囦欢
},
//鎵撳嵃
get_PrintReport() {
if (this.ids.length != 1) {
- this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�");
} else if (this.rowForm.鐘舵�� != "宸插鏍�" && !this.defaintOperationByCompanyName()) {
this.$modal.msgError("鎵撳嵃澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!");
} else {
- axios.get(this.baseURL + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
- params: { "HInterID": this.rowForm.hmainid }
- }).then(response => {
- var result = response.data
- if (result.count == 1) {
- this.printListShow = true
- this.openPrintList = true
- // this.$router.push({ path:'/printList', query: { linterid: this.rowForm.hmainid,MyMsg:this.rowForm.hmainid,Type:'Kf_SellOutBillList' }})
- } else {
- this.$modal.msgError(result.code + result.Message)
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
-
-
+ axios
+ .get(this.baseURL + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
+ params: { HInterID: this.rowForm.hmainid },
+ })
+ .then((response) => {
+ var result = response.data;
+ if (result.count == 1) {
+ this.printListShow = true;
+ this.openPrintList = true;
+ // this.$router.push({ path:'/printList', query: { linterid: this.rowForm.hmainid,MyMsg:this.rowForm.hmainid,Type:'Kf_SellOutBillList' }})
+ } else {
+ this.$modal.msgError(result.code + result.Message);
+ }
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
}
// var content= ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Kf_SellOutBillList', 'yes']
},
@@ -822,19 +1135,22 @@
//#region 鑾峰彇鍏徃鍚嶏紝鏍规嵁鍏徃杩涜瀹氬埗鍖栧紑鍙�
defaintOperationByCompanyName() {
var result = false;
- axios.get(this.baseURL + '/Xt_getInfo/getCompanyName').then(response => {
- var data1 = response.data
- if (data1.count == 1) {
- if (data1.data == "姘村姟") {
- result = true;
+ axios
+ .get(this.baseURL + "/Xt_getInfo/getCompanyName")
+ .then((response) => {
+ var data1 = response.data;
+ if (data1.count == 1) {
+ if (data1.data == "姘村姟") {
+ result = true;
+ }
}
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
return result;
},
- }
+ },
};
</script>
<style>
diff --git a/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue b/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue
index 72790d1..b8e751c 100644
--- a/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue
+++ b/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue
@@ -9,15 +9,23 @@
class="searchBox"
>
<el-row>
- <el-form-item label="鏃ユ湡" style="margin-left: 100px">
+ <el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px">
<el-date-picker
- v-model="dateRange"
- value-format="yyyy-MM-dd"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- ></el-date-picker>
+ v-model="sTime"
+ type="date"
+ placeholder="寮�濮嬫棩鏈�"
+ style="width: 150px"
+ >
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="缁撴潫鏃ユ湡">
+ <el-date-picker
+ v-model="eTime"
+ type="date"
+ placeholder="缁撴潫鏃ユ湡"
+ style="width: 150px"
+ >
+ </el-date-picker>
</el-form-item>
<el-form-item label="鏃ユ湡闂撮殧">
<el-select
@@ -605,6 +613,8 @@
import axios from "axios";
import RowSettings from "@/views/component/rowSettings";
import dayjs from "dayjs";
+import { computed } from "vue";
+import { watch } from "vue";
export default {
name: "GySource",
@@ -769,7 +779,15 @@
};
},
mounted() {
+ window.editGyClose = () => {
+ this.editGyClose(); // 缁勪欢鍐呯殑鏂规硶缁戝畾鍒皐indows
+ };
this.queryParams.HOrgID = sessionStorage["Organization"];
+ },
+
+ beforeDestroy() {
+ // 缁勪欢閿�姣佹椂娓呯悊鍏ㄥ眬鏂规硶锛岄伩鍏嶅唴瀛樻硠婕�
+ delete window.editGyClose;
},
created() {
this.riqiChange();
@@ -939,11 +957,9 @@
// this.queryParams.HOrgID = 100038
// this.sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) >= '2020-01-01' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2030-01-01'`;
// 鏀舵枡閫氱煡鍗曞垪琛�
- if (this.dateRange.length > 0) {
- this.sWhere +=
- " and CONVERT(varchar(100),鏃ユ湡, 23) >= ''" + this.dateRange[0] + "''";
- this.sWhere +=
- " and CONVERT(varchar(100),鏃ユ湡, 23) <= ''" + this.dateRange[1] + "''";
+ if (this.sTime) {
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
}
try {
let res = await axios.get(this.baseURL + "Xs_SeOrderBill/list_ByPage", {
@@ -1294,6 +1310,7 @@
}
this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
}
+
if (this.queryParams.HBillNo) {
this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
}
diff --git a/src/views/sell/xsSeOrderBill/xsSeOrderBillEdit.vue b/src/views/sell/xsSeOrderBill/xsSeOrderBillEdit.vue
index c71d57b..006a9ec 100644
--- a/src/views/sell/xsSeOrderBill/xsSeOrderBillEdit.vue
+++ b/src/views/sell/xsSeOrderBill/xsSeOrderBillEdit.vue
@@ -935,8 +935,10 @@
//閫�鍑�
close() {
this.reset();
-
- if (!this.OperationType2 && !this.copyType) {
+ if (window.top != window.self) {
+ // iframe 椤甸潰 璋冪敤鐖堕〉闈㈢殑鍑芥暟鍏抽棴寮圭獥
+ window.parent.editGyClose();
+ } else if (!this.OperationType2 && !this.copyType) {
// this.$router.back()
window.close();
} else {
@@ -1187,8 +1189,11 @@
},
})
.then((response) => {
- this.form.鑱旂郴浜� = response.data.data[0].HLinkMan;
- this.form.鑱旂郴鐢佃瘽 = response.data.data[0].HLinkPhone;
+ if (response.data.count == 1) {
+ this.form.鑱旂郴浜� = response.data.data[0].HLinkMan;
+ this.form.鑱旂郴鐢佃瘽 = response.data.data[0].HLinkPhone;
+ }
+ this.$modal.msg(`璀﹀憡: ${response.data.Message}`);
// this.form = response.data.data[0]
})
.catch((error) => {
--
Gitblit v1.9.1