diff --git a/src/views/inout/IoCreateBusOrder.vue b/src/views/inout/IoCreateBusOrder.vue
index fd4072c..710b18f 100644
--- a/src/views/inout/IoCreateBusOrder.vue
+++ b/src/views/inout/IoCreateBusOrder.vue
@@ -6,33 +6,39 @@
ref="form"
class="query-form" size="mini" label-width="100px" v-show="showSearch">
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
- -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @change="invChange"
+ >
+ :value="item.code">
{{ item.name }}
@@ -40,23 +46,25 @@
-
-
-
+
+
+ clearable>
+ :value="item.action">
{{ item.name }}
-
+
+
+
+
+
+
diff --git a/src/views/inout/IoCreateScanOrder.vue b/src/views/inout/IoCreateScanOrder.vue
index abb8f0b..eda17cd 100644
--- a/src/views/inout/IoCreateScanOrder.vue
+++ b/src/views/inout/IoCreateScanOrder.vue
@@ -3,32 +3,39 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
- -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @change="invChange"
+ >
+ :value="item.code">
{{ item.name }}
@@ -36,23 +43,25 @@
-
-
-
+
+
+ clearable>
+ :value="item.action">
{{ item.name }}
-
+
+
+
+
+
+
diff --git a/src/views/inout/IoDealOrder.vue b/src/views/inout/IoDealOrder.vue
index a534cdb..f8e277d 100644
--- a/src/views/inout/IoDealOrder.vue
+++ b/src/views/inout/IoDealOrder.vue
@@ -3,32 +3,39 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
- -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @change="invChange"
+ >
+ :value="item.code">
{{ item.name }}
@@ -36,23 +43,25 @@
-
-
-
+
+
+ clearable>
+ :value="item.action">
{{ item.name }}
-
+
+
+
+
+
+
diff --git a/src/views/inout/IoDeliverySearchOrder.vue b/src/views/inout/IoDeliverySearchOrder.vue
index cf8561c..168d3cc 100644
--- a/src/views/inout/IoDeliverySearchOrder.vue
+++ b/src/views/inout/IoDeliverySearchOrder.vue
@@ -19,32 +19,33 @@
+
-
-
+
+ @change="invChange"
+ >
+ :value="item.code">
{{ item.name }}
-
-
+
+ clearable>
+ :value="item.action">
{{ item.name }}
@@ -108,8 +109,7 @@
@current-change="handleSelectionChange">
-
-
+
@@ -117,7 +117,7 @@
-
+
{{ fromTypeMap[scope.row.fromType] }}
@@ -139,7 +139,6 @@
-
{{
@@ -156,7 +155,7 @@
-
+
@@ -247,45 +246,45 @@
@@ -330,48 +329,48 @@
>
@@ -420,6 +419,7 @@
diff --git a/src/views/inout/IoInoutSearchOrder.vue b/src/views/inout/IoInoutSearchOrder.vue
index 2174e40..1e12442 100644
--- a/src/views/inout/IoInoutSearchOrder.vue
+++ b/src/views/inout/IoInoutSearchOrder.vue
@@ -2,51 +2,49 @@
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
- -->
+
+
+
+
+
+
+
+
+
+
+
+ @change="invChange"
+ >
+ :value="item.code">
{{ item.name }}
-
-
-
+
+
+ clearable>
+ :value="item.action">
{{ item.name }}
@@ -54,7 +52,7 @@
-
+
+
+
+
+
+
+
@@ -93,10 +107,10 @@
@current-change="handleSelectionChange">
-
-
-
-
+
+
+
+
{{ fromTypeMap[scope.row.fromType] }}
@@ -107,9 +121,7 @@
-
-
-
+
{{ scope.row.createTime }}
@@ -124,14 +136,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -149,8 +161,6 @@
>撤回
-
-
-
+
@@ -298,48 +308,48 @@
>
@@ -388,6 +398,7 @@
@@ -538,6 +549,7 @@ export default {
billNo: ""
},
actDateRange: [],
+ auditDateRange: [],
pickerOptions: {
shortcuts: [
{
@@ -628,6 +640,15 @@ export default {
this.filterQuery.startTime = null;
this.filterQuery.endTime = null;
}
+
+ if (this.auditDateRange !== null) {
+ this.filterQuery.startAduditTime = this.auditDateRange[0];
+ this.filterQuery.endAduditTime = this.auditDateRange[1];
+ } else {
+ this.filterQuery.startAduditTime = null;
+ this.filterQuery.endAduditTime = null;
+ }
+
this.filterQuery.page = 1;
this.getList();
},
diff --git a/src/views/inout/IoReturnedSearchOrder.vue b/src/views/inout/IoReturnedSearchOrder.vue
new file mode 100644
index 0000000..cb84557
--- /dev/null
+++ b/src/views/inout/IoReturnedSearchOrder.vue
@@ -0,0 +1,991 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 显示/隐藏搜索栏
+ 重置
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ fromTypeMap[scope.row.fromType] }}
+
+
+
+
+
+
+ {{ scope.row.createTime }}
+
+
+
+
+
+
+ {{ scope.row.createTime }}
+
+
+
+
+
+
+ {{
+ checkStatus[scope.row.status]
+ }}
+
+
+
+
+
+
+ 打印
+
+ 撤回
+
+
+
+ 审核
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+ 单据 {{ currentRow.billNo }}-业务详情
+
+
+
+
+
+
+
+ 重置
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 单据 {{ currentRow.billNo }}-扫码详情
+
+
+
+
+
+
+
+ 重置
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 单据 {{ currentRow.billNo }}-扫码明细
+
+
+
+
+
+
+
+ 重置
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
显示/隐藏搜索栏
@@ -75,11 +74,12 @@
-
+
+
-
+
{{ lockStatusMap[scope.row.lockStatus] }}
diff --git a/src/views/supplier/products/supDiProductsCheck.vue b/src/views/supplier/products/supDiProductsCheck.vue
index 9275daa..37bee3e 100644
--- a/src/views/supplier/products/supDiProductsCheck.vue
+++ b/src/views/supplier/products/supDiProductsCheck.vue
@@ -102,9 +102,9 @@
:close-on-click-modal="false"
:close-on-press-escape="false"
title="产品信息详情"
- :visible.sync="thrProductsDetailVisible"
+ :visible.sync="thrProductsDiDetailVisible"
width="60%"
- v-if="thrProductsDetailVisible"
+ v-if="thrProductsDiDetailVisible"
>
@@ -113,9 +113,9 @@
:close-on-click-modal="false"
:close-on-press-escape="false"
title="产品信息详情"
- :visible.sync="thrProductsDiDetailVisible"
+ :visible.sync="thrProductsDetailVisible"
width="80%"
- v-if="thrProductsDiDetailVisible"
+ v-if="thrProductsDetailVisible"
>
{
if (res.code === 20000) {
- this.diDetails = res.data
- this.detailDialog = true
+ this.thisData = res.data
+ this.thrProductsDiDetailVisible = true
} else {
this.$message.error('参数错误')
}
})
}else{
this.thisDetail = row;
- this.thrProductsDiDetailVisible = true;
+ this.thrProductsDetailVisible = true;
}
},
handleCurrentChange(val) {
diff --git a/src/views/supplier/products/supProductsDetail.vue b/src/views/supplier/products/supProductsDetail.vue
index aac6ac3..1bc9de3 100644
--- a/src/views/supplier/products/supProductsDetail.vue
+++ b/src/views/supplier/products/supProductsDetail.vue
@@ -7,7 +7,7 @@
-
+
diff --git a/src/views/userManage/customerManage.vue b/src/views/userManage/customerManage.vue
index 4ca8ac4..a9cd94c 100644
--- a/src/views/userManage/customerManage.vue
+++ b/src/views/userManage/customerManage.vue
@@ -1,329 +1,323 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ 重置
+ 查询
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
- {{ bussinessFlag[scope.row.bussinessStatus] }}
-
-
-
-
- {{
- scope.row.userFlag | statusFilterName
- }}
-
-
-
+
+
+ {{ bussinessFlag[scope.row.bussinessStatus] }}
+
+
+
+
+ {{
+ scope.row.userFlag | statusFilterName
+ }}
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
- 查看用户
-
+
+
+
+ 查看用户
+
- 查看联系人
-
-
-
- 查看联系人
+
+
+
+
+
+
+ 编辑
+
-
-
- 编辑
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 禁用
+ 正常
+ 未验证
+
+
-
-
- 禁用
- 正常
- 未验证
-
-
+
+
+ {{
+ item.roleName
+ }}
+
+
+
+
-
-
- {{
- item.roleName
- }}
-
-
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 重置
+
+ 查询
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
- {{ bussinessFlag[scope.row.bussinessStatus] }}
-
-
-
-
-
-
- {{ checkFlag[scope.row.checkType] }}
-
-
+
+
+
+
+
+
+ {{ bussinessFlag[scope.row.bussinessStatus] }}
+
+
+
+
+
+
+ {{ checkFlag[scope.row.checkType] }}
+
+
-
-
- 审核
-
+
+
+ 审核
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
- 用户名称:
-
-
-
-
-
-
-
-
-
- 企业名称:
-
-
-
+
+
+
+ 用户名称:
+
+
+
+
+
+
+
+
+
+ 企业名称:
+
+
+
-
-
-
- {{ item.name }}
-
-
-
-
-
+
+
+
+ {{ item.name }}
+
+
+
+
+
-
-
-
- 联系人:
-
-
-
-
-
-
-
-
-
- 企业类型:
-
-
-
-
-
-
-
-
+
+
+
+ 联系人:
+
+
+
+
+
+
+
+
+
+ 企业类型:
+
+
+
+
+
+
+
+
-
-
-
- 电话:
-
-
-
-
-
-
-
-
-
- 所属地区:
-
-
-
-
-
-
-
-
+
+
+
+ 电话:
+
+
+
+
+
+
+
+
+
+ 所属地区:
+
+
+
+
+
+
+
+
-
-
-
- 手机:
-
-
-
-
-
-
-
-
-
- 邮箱:
-
-
-
-
-
-
-
-
+
+
+
+ 手机:
+
+
+
+
+
+
+
+
+
+ 邮箱:
+
+
+
+
+
+
+
+
-
-
-
- 所属供应商:
-
-
-
-
-
-
- {{item.name}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ 所属供应商:
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
- 分配角色:
-
-
-
-
-
-
- {{
- item.roleName
- }}
-
-
-
-
-
-
-
+
+
+
+ 分配角色:
+
+
+
+
+
+
+ {{
+ item.roleName
+ }}
+
+
+
+
+
+
+
-
-
-
-
+