diff --git a/src/views/inout/receive/receiveAdd.vue b/src/views/inout/receive/receiveAdd.vue
index 164d6514..3e172a05 100644
--- a/src/views/inout/receive/receiveAdd.vue
+++ b/src/views/inout/receive/receiveAdd.vue
@@ -293,7 +293,7 @@ export default {
this.filterQuery.startTime = null;
this.filterQuery.endTime = null;
}
-
+ this.filterQuery.isUser = true; //只查询自己
getReceiveOrder(this.filterQuery)
.then((response) => {
if (response.code == 20000) {
diff --git a/src/views/inout/receive/receiveAudit.vue b/src/views/inout/receive/receiveAudit.vue
index af3fe396..0c05fa19 100644
--- a/src/views/inout/receive/receiveAudit.vue
+++ b/src/views/inout/receive/receiveAudit.vue
@@ -285,6 +285,7 @@ export default {
this.filterQuery.endTime = null;
}
this.loading = true;
+ this.filterQuery.isInvCode = true;
getReceiveOrder(this.filterQuery)
.then((response) => {
if (response.code == 20000) {
diff --git a/src/views/inout/receive/receiveMySearch.vue b/src/views/inout/receive/receiveMySearch.vue
new file mode 100644
index 00000000..a7e7679d
--- /dev/null
+++ b/src/views/inout/receive/receiveMySearch.vue
@@ -0,0 +1,443 @@
+<template>
+ <div>
+ <el-card class="el-card">
+ <el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
+ <el-row>
+ <el-col :span="8" >
+ <el-form-item label="领用单号:">
+ <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="领用仓库:">
+ <el-select v-model="filterQuery.invCode" placeholder="请选择领用仓库" style="width: 90%;">
+ <el-option
+ v-for="item in invList"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="往来信息:">
+ <el-select v-model="filterQuery.corpName" placeholder="请输入往来信息"
+ filterable
+ remote
+ reserve-keyword
+ :remote-method="finCorpList"
+ :loading="loading"
+ style="width: 100%;">
+ <el-option
+ v-for="item in corpList"
+ :key="item.code"
+ :label="item.name"
+ :value="item.name">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <!-- <el-col :span="6">-->
+ <!-- <el-form-item label="领用类型:">-->
+ <!-- <el-select v-model="filterQuery.billType" style="width: 90%" placeholder="请选择领用类型" clearable="true">-->
+ <!-- <el-option-->
+ <!-- v-for="item in originTypes"-->
+ <!-- :key="item.originAction"-->
+ <!-- :label="item.originName"-->
+ <!-- :value="item.originAction">-->
+ <!-- <span style="float: left;font-size: 13px">{{ item.originName }}</span>-->
+ <!-- <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{-->
+ <!-- item.thirdSysName-->
+ <!-- }}</span>-->
+ <!-- </el-option>-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
+ <!-- </el-col>-->
+ </el-row>
+ <el-row>
+ <el-col :span="8">
+ <el-form-item label="创建时间:">
+ <el-date-picker
+ style="width: 90%"
+ :picker-options="pickerOptions"
+ v-model="actDateRange"
+ type="daterange"
+ format="yyyy 年 MM 月 dd 日"
+ value-format="yyyy-MM-dd"
+ range-separator="至"
+ start-placeholder="开始日期"
+ end-placeholder="结束日期"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+
+ <el-col :span="8">
+ <el-form-item label="审核时间:">
+ <el-date-picker
+ style="width: 90%"
+ :picker-options="pickerAuditOptions"
+ v-model="actAuditDateRange"
+ type="daterange"
+ format="yyyy 年 MM 月 dd 日"
+ value-format="yyyy-MM-dd"
+ range-separator="至"
+ start-placeholder="开始日期"
+ end-placeholder="结束日期"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+
+ <div class="top-right-btn">
+ <el-button-group style="display:flex;">
+ <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+ <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+ <el-button type="primary" icon="el-icon-search" @click="onSubmitFind">查询</el-button>
+ </el-button-group>
+ </div>
+
+ <el-divider style="margin: 15px"></el-divider>
+
+ <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row="true" @current-change="handleDetail"
+ :default-sort="defaultSort" @sort-change="handleSortChange">
+ <el-table-column label="序号" type="index" width="60"></el-table-column>
+ <el-table-column label="领用单号" prop="billNo"></el-table-column>
+ <el-table-column label="领用部门" prop="deptName"></el-table-column>
+ <el-table-column label="领用仓库" prop="invName"></el-table-column>
+ <el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true"></el-table-column>
+ <el-table-column label="单据状态" prop="status">
+ <template slot-scope="scope">
+ <el-tag :type="(scope.row.status)">
+ {{ statusMap[scope.row.status] }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column label="创建时间" prop="createTime"
+ sortable="custom" :sort-orders="['ascending', 'descending']" ></el-table-column>
+ <el-table-column label="审核时间" prop="auditTime"
+ sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column>
+ </el-table>
+
+ <pagination
+ v-show="total>0"
+ :total="total"
+ :page.sync="filterQuery.page"
+ :limit.sync="filterQuery.limit"
+ @pagination="handleCurrentChange"
+ ></pagination>
+
+ </el-card>
+ <el-card class="el-card">
+ <el-table v-loading="loading" :data="detailList" style="width: 100%" border>
+ <el-table-column label="序号" type="index" width="60"></el-table-column>
+ <el-table-column label="DI/物资编码" prop="nameCode"></el-table-column>
+ <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>
+ <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip="true"></el-table-column>
+ <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
+ <el-table-column label="领用数量" prop="count"></el-table-column>
+ <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
+ <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
+ <el-table-column label="供应商" prop="supName"></el-table-column>
+ </el-table>
+ </el-card>
+ <el-dialog
+ :visible.sync="newSpDistributionVisible"
+ width="80%"
+ v-if="newSpDistributionVisible"
+ :close-on-click-modal="false"
+ :close-on-press-escape="false"
+ >
+ <auditDetail
+ :closeDialog="closeDialog"
+ :idQuery="idQuery"
+ ></auditDetail>
+ </el-dialog>
+ </div>
+</template>
+<script>
+
+import {getOrderDetail, getReceiveOrder} from "@/api/inout/receiveOrder";
+import auditDetail from "@/views/inout/receive/receiveAuditDetail"
+import {delReceive} from "@/api/thrsys/thrOrderReceive";
+import {filterSubAll, findInvByUser} from "@/api/system/invSubWarehouse";
+
+export default {
+ data() {
+ return {
+ defaultSort: {prop: 'createTime', order: 'desc'},
+ showSearch: true,
+ filterQuery: {
+ billAction: null,
+ billNo: "",
+ originType: null,
+ thirdSysFk: "",
+ page: 1,
+ limit: 10,
+ corpName: null,
+ type: 3,
+ editStatus: 2,
+ invCode:null
+ },
+ statusMap: {
+ 1: "草稿",
+ 2: "未审核",
+ 3: "已审核",
+ 4: "已拒绝"
+ },
+ idQuery:null,
+ invList:[],
+ invCodebe:null,
+ newSpDistributionVisible:false,
+ total: 0,
+ thirdSys: [],
+ thirdSysDetail: null,
+ busTypes: [],
+ originTypes: [],
+ list: [],
+ corpList:[],
+ detailList: [],
+ uploadFileUrl: null,
+ fileList: [],
+ uploadData: {
+ thirdSys: "thirdId",
+ },
+ loading: false,
+ actDateRange: [],
+ actAuditDateRange: [],
+ pickerOptions: {
+ shortcuts: [
+ {
+ text: "最近一周",
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+ picker.$emit("pick", [start, end]);
+ },
+ },
+ {
+ text: "最近一个月",
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+ picker.$emit("pick", [start, end]);
+ },
+ },
+ {
+ text: "最近三个月",
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+ picker.$emit("pick", [start, end]);
+ },
+ },
+ ],
+ },
+
+ pickerAuditOptions: {
+ shortcuts: [
+ {
+ text: "最近一周",
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+ picker.$emit("pick", [start, end]);
+ },
+ },
+ {
+ text: "最近一个月",
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+ picker.$emit("pick", [start, end]);
+ },
+ },
+ {
+ text: "最近三个月",
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+ picker.$emit("pick", [start, end]);
+ },
+ },
+ ],
+ },
+ };
+ },
+
+ methods: {
+ onReset() {
+ this.$router.push({
+ path: "",
+ });
+ this.filterQuery = {
+ billNo: "",
+ thirdSysFk: "",
+ billFlag: null,
+ billAction: null,
+ startDate: null,
+ endDate: null,
+ page: 1,
+ limit: 10,
+ corpName: null,
+ type: 3,
+ editStatus: 2,
+ invCode: this.invCodebe,
+ };
+ this.actDateRange = [];
+ this.actAuditDateRange = [];
+ this.getList();
+ },
+
+ onSubmitFind() {
+ this.filterQuery.page = 1;
+ this.getList();
+ },
+ hideSearch() {
+ this.showSearch = !this.showSearch;
+ },
+ deleteDialog(row) {
+ this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ let dQuery = {
+ orderIdFk: row.billNo,
+ };
+ delReceive(dQuery)
+ .then((response) => {
+ if (response.code == 20000) {
+ this.$message.success("删除成功");
+ this.getList();
+ this.detailList=null;
+ } else {
+ this.$message.error(response.message);
+ }
+ })
+ .catch(() => {
+ });
+
+ })
+ .catch(() => {
+ });
+ },
+
+ handleSortChange(column, prop, order) {
+ if (column.order === 'descending') {
+ this.filterQuery.sort = 'desc'
+ } else {
+ this.filterQuery.sort = 'asc'
+ }
+ this.filterQuery.orderBy = column.prop;
+ this.getList();
+ },
+
+ getList() {
+ if (this.actDateRange != null) {
+ this.filterQuery.startTime = this.actDateRange[0];
+ this.filterQuery.endTime = this.actDateRange[1];
+ } else {
+ this.filterQuery.startTime = null;
+ this.filterQuery.endTime = null;
+ }
+ if (this.actAuditDateRange != null) {
+ this.filterQuery.startAuditTime = this.actAuditDateRange[0];
+ this.filterQuery.endAuditTime = this.actAuditDateRange[1];
+ } else {
+ this.filterQuery.startAuditTime = null;
+ this.filterQuery.endAuditTime = null;
+ }
+ this.filterQuery.isUser = true;
+ this.loading = true;
+ this.detailList=[]
+ getReceiveOrder(this.filterQuery)
+ .then((response) => {
+ if (response.code == 20000) {
+ this.list = response.data.list || [];
+ this.total = response.data.total || 0;
+ } else {
+ this.$message.error(response.message);
+ }
+ this.loading = false;
+ })
+ .catch(() => {
+ this.loading = false;
+ this.list = [];
+ this.total = 0;
+ });
+ },
+ handleDetail(row) {
+ var query={};
+ query.orderIdFk = row.billNo;
+ getOrderDetail(query) //查找该单号下的所有条码
+ .then((response) => {
+ this.detailList = response.data.list || [];
+ })
+ .catch(() => {
+ this.detailList = [];
+ });
+ },
+ handleCurrentChange(val) {
+ this.filterQuery.page = val.page;
+ this.getList();
+ },
+ finCorpList(val){
+ let query ={
+ name : val,
+ page : 1,
+ limit : 10,
+ }
+ filterSubAll(query)
+ .then((response) => {
+ this.loading = false;
+ this.corpList = response.data || [];
+ })
+ .catch(() => {
+ this.loading = false;
+ this.corpList = [];
+ });
+ },
+
+ finCurInv() {
+ this.invList = [];
+ let query = {
+ filter: 3
+ };
+ findInvByUser(query)
+ .then((response) => {
+ this.invList = response.data || [];
+ if(this.invList.length>0){
+ this.filterQuery.invCode=this.invList[0].code
+ this.invCodebe=this.filterQuery.invCode
+ }
+ this.getList();
+ })
+ .catch(() => {
+ });
+ },
+
+ },
+ components: {
+ auditDetail
+ },
+ mounted() {
+ },
+ created() {
+ this.finCurInv();
+ },
+};
+</script>
+<style scoped>
+</style>
+
diff --git a/src/views/inout/receive/receiveSearch.vue b/src/views/inout/receive/receiveSearch.vue
index 8a5706fe..4f67ba61 100644
--- a/src/views/inout/receive/receiveSearch.vue
+++ b/src/views/inout/receive/receiveSearch.vue
@@ -186,7 +186,6 @@ export default {
limit: 10,
corpName: null,
type: 3,
- editStatus: 2,
invCode:null
},
statusMap: {
@@ -297,7 +296,6 @@ export default {
limit: 10,
corpName: null,
type: 3,
- editStatus: 2,
invCode: this.invCodebe,
};
this.actDateRange = [];
diff --git a/src/views/inventory/DeviceInspectOrderAudit.vue b/src/views/inventory/DeviceInspectOrderAudit.vue
index 2a991db9..560a330f 100644
--- a/src/views/inventory/DeviceInspectOrderAudit.vue
+++ b/src/views/inventory/DeviceInspectOrderAudit.vue
@@ -36,7 +36,7 @@
<el-col :span="8">
<el-form-item class="query-form-item" label="维保记录号:">
- <el-input v-model="filterQuery.orderId" style="width: 90%" placeholder="请输入报修记录号"
+ <el-input v-model="filterQuery.orderId" style="width: 90%" placeholder="请输入维保记录号"
clearable="true"></el-input>
</el-form-item>
</el-col>
@@ -210,7 +210,8 @@ export default {
page: 1,
limit: 20,
};
- this.getList();
+ // this.getList();
+ this.getDeptList();
},
onSubmit() {
this.filterQuery.page = 1;
@@ -239,6 +240,7 @@ export default {
this.invList = [];
this.spaceList = [];
this.filterQuery.fromInvCode = null;
+ this.filterQuery.invCode = null;
this.filterQuery.fromInvSpaceCode = null;
this.getInvList();
},
diff --git a/src/views/inventory/DeviceInspectOrderCompleted.vue b/src/views/inventory/DeviceInspectOrderCompleted.vue
index bdcfd1ca..3c98e441 100644
--- a/src/views/inventory/DeviceInspectOrderCompleted.vue
+++ b/src/views/inventory/DeviceInspectOrderCompleted.vue
@@ -36,7 +36,7 @@
<el-col :span="8">
<el-form-item class="query-form-item" label="维保记录号:">
- <el-input v-model="filterQuery.orderId" style="width: 90%" placeholder="请输入报修记录号"
+ <el-input v-model="filterQuery.orderId" style="width: 90%" placeholder="请输入维保记录号"
clearable="true"></el-input>
</el-form-item>
</el-col>
@@ -194,7 +194,8 @@ export default {
page: 1,
limit: 20,
};
- this.getList();
+ // this.getList();
+ this.getDeptList();
},
onSubmit() {
this.filterQuery.page = 1;
@@ -223,6 +224,7 @@ export default {
this.invList = [];
this.spaceList = [];
this.filterQuery.fromInvCode = null;
+ this.filterQuery.invCode = null;
this.filterQuery.fromInvSpaceCode = null;
this.getInvList();
},
diff --git a/src/views/inventory/DeviceInspectOrderModify.vue b/src/views/inventory/DeviceInspectOrderModify.vue
index 0deefcb7..8cd29ca2 100644
--- a/src/views/inventory/DeviceInspectOrderModify.vue
+++ b/src/views/inventory/DeviceInspectOrderModify.vue
@@ -23,6 +23,7 @@
placeholder="请选择部门"
clearable="true"
@change="deptChange"
+ :disabled="ischeck"
style="width: 90%"
>
<el-option
@@ -41,6 +42,7 @@
<el-select v-model="inspectOrder.invCode"
placeholder="请选择仓库"
clearable="true"
+ :disabled="isDeviceNameEmpty||ischeck"
style="width: 90%"
>
<el-option
@@ -193,6 +195,8 @@ export default {
return {
deptList: [],
invList: [],
+ isDeviceNameEmpty: false,
+ ischeck: true,
deviceDialogVisible: false,
deviceLoading: false,
filterQuery: {
@@ -207,9 +211,12 @@ export default {
deptName: null,
invName: null,
selectRow: null,
+ check: false,
};
},
+
methods: {
+
deptChange() {
if(this.inspectOrder.id == null){
this.inspectOrder.deviceName=null;
@@ -217,6 +224,7 @@ export default {
}
this.inspectOrder.invCode = null;
this.invList = [];
+ this.isDeviceNameEmpty=false;
this.getInvList();
},
getDeptList() {
@@ -258,6 +266,7 @@ export default {
return;
}
this.setDeptAnInvName();
+ this.check = false
this.deviceDialogVisible = true;
this.filterQuery = {
code: null,
@@ -303,6 +312,7 @@ export default {
onReset() {
this.filterQuery.code = null;
this.filterQuery.page = 1;
+ this.filterQuery.limit = 10;
this.getDeviceList();
},
queryDevice() {
@@ -310,12 +320,18 @@ export default {
this.getDeviceList();
},
handleCurrentChange(row) {
+ this.check = !this.check
this.selectRow = row;
},
combine() {
+ if (this.check == false) {
+ this.$message.error("请选择设备!")
+ return;
+ }
this.deviceDialogVisible = false;
this.inspectOrder.code = this.selectRow.code;
this.inspectOrder.deviceName = this.selectRow.deviceName;
+ this.isDeviceNameEmpty=true;
},
},
created() {
diff --git a/src/views/inventory/DeviceInspectOrderNew.vue b/src/views/inventory/DeviceInspectOrderNew.vue
index 821b0bff..cea5e6b9 100644
--- a/src/views/inventory/DeviceInspectOrderNew.vue
+++ b/src/views/inventory/DeviceInspectOrderNew.vue
@@ -36,7 +36,7 @@
<el-col :span="8">
<el-form-item class="query-form-item" label="维保记录号:">
- <el-input v-model="filterQuery.orderId" style="width: 90%" placeholder="请输入报修记录号"
+ <el-input v-model="filterQuery.orderId" style="width: 90%" placeholder="请输入维保记录号"
clearable="true"></el-input>
</el-form-item>
</el-col>
@@ -242,7 +242,8 @@ export default {
page: 1,
limit: 20,
};
- this.getList();
+ // this.getList();
+ this.getDeptList();
},
onSubmit() {
this.filterQuery.page = 1;
@@ -271,7 +272,9 @@ export default {
this.invList = [];
this.spaceList = [];
this.filterQuery.fromInvCode = null;
+ this.filterQuery.invCode = null;
this.filterQuery.fromInvSpaceCode = null;
+ console.log("11"+this.filterQuery.invCode)
this.getInvList();
},
getDeptList() {
@@ -341,7 +344,7 @@ export default {
});
},
deleteDialog(rowId) {
- this.$confirm('此操作将永久删除该领用记录, 是否继续?', '提示', {
+ this.$confirm('此操作将永久删除该维保单, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
diff --git a/src/views/inventory/DeviceRepairOrderAudit.vue b/src/views/inventory/DeviceRepairOrderAudit.vue
index 49d4cb4b..d1ebe119 100644
--- a/src/views/inventory/DeviceRepairOrderAudit.vue
+++ b/src/views/inventory/DeviceRepairOrderAudit.vue
@@ -272,11 +272,13 @@ export default {
orderId: null,
deptCode: this.$store.getters.locDeptCode,
invCode: null,
+ code: null,
status: 1,
page: 1,
limit: 20
};
- this.getList();
+ // this.getList();
+ this.getDeptList();
},
onSubmit() {
this.filterQuery.page = 1;
@@ -335,6 +337,7 @@ export default {
deptChange() {
this.invList = [];
this.filterQuery.invCode = null;
+ console.log(this.filterQuery.invCode)
this.getInvList();
},
getDeptList() {
diff --git a/src/views/inventory/DeviceRepairOrderCompleted.vue b/src/views/inventory/DeviceRepairOrderCompleted.vue
index a8bab52e..8a70a56f 100644
--- a/src/views/inventory/DeviceRepairOrderCompleted.vue
+++ b/src/views/inventory/DeviceRepairOrderCompleted.vue
@@ -301,7 +301,8 @@ export default {
page: 1,
limit: 20
};
- this.getList();
+ // this.getList();
+ this.getDeptList();
},
onSubmit() {
this.filterQuery.page = 1;
@@ -366,7 +367,7 @@ export default {
getDeptListByUser().then((res) => {
this.deptList = res.data || [];
this.getInvList();
- // this.getList();
+ this.getList();
});
},
invChange() {
diff --git a/src/views/inventory/DeviceRepairOrderNew.vue b/src/views/inventory/DeviceRepairOrderNew.vue
index f5e8d036..c5242aba 100644
--- a/src/views/inventory/DeviceRepairOrderNew.vue
+++ b/src/views/inventory/DeviceRepairOrderNew.vue
@@ -287,8 +287,10 @@ export default {
page: 1,
limit: 20
};
- this.getList();
+ // this.getList();
+ this.getDeptList();
},
+
onSubmit() {
this.filterQuery.page = 1;
this.getList();