修复销售出库单日期和点击事件问题,分布式调入调出单等问题修复
| | |
| | | <el-col :span="6"> |
| | | <el-form-item label="过滤"> |
| | | <el-select v-model="query.ColName" style="width:190px"> |
| | | <el-option value="0" label=""></el-option> |
| | | <!-- <el-option value="0" label=""></el-option> --> |
| | | <el-option v-for="col in filterColumns" :key="col.field" :value="col.field" :label="col.title" /> |
| | | </el-select> |
| | | </el-form-item> |
| | | </el-col> |
| | | <el-col :span="6"> |
| | | <el-select v-model="query.Comparator" style="width:190px"> |
| | | <el-option value="0" label=""></el-option> |
| | | <!-- <el-option value="0" label=""></el-option> --> |
| | | <el-option value="=" label="=" /> |
| | | <el-option value=">=" label=">=" /> |
| | | <el-option value=">" label=">" /> |
| | |
| | | </el-col> |
| | | <el-col :span="6"> |
| | | <el-select v-model="query.Comparator1" style="width:190px"> |
| | | <el-option value="0" label=""></el-option> |
| | | <!-- <el-option value="0" label=""></el-option> --> |
| | | <el-option value="=" label="=" /> |
| | | <el-option value=">=" label=">=" /> |
| | | <el-option value=">" label=">" /> |
| | |
| | | </el-col> |
| | | <el-col :span="6"> |
| | | <el-select v-model="query.Comparator2" style="width:190px"> |
| | | <el-option value="0" label=""></el-option> |
| | | <!-- <el-option value="0" label=""></el-option> --> |
| | | <el-option value="=" label="=" /> |
| | | <el-option value=">=" label=">=" /> |
| | | <el-option value=">" label=">" /> |
| | |
| | | HSourceBillNo: '', |
| | | Warehouse: '', |
| | | Hmaker: '', |
| | | ColName: '0', |
| | | Comparator: '0', |
| | | ColName: '', |
| | | Comparator: '', |
| | | ColContent: '', |
| | | ColName1: '0', |
| | | Comparator1: '0', |
| | | ColName1: '', |
| | | Comparator1: '', |
| | | ColContent1: '', |
| | | ColName2: '0', |
| | | Comparator2: '0', |
| | | ColName2: '', |
| | | Comparator2: '', |
| | | ColContent2: '' |
| | | }, |
| | | timeCycles: [ |
| | |
| | | <el-col :span="6"> |
| | | <el-form-item label="过滤"> |
| | | <el-select v-model="query.ColName" style="width:190px"> |
| | | <el-option value="0" label=""></el-option> |
| | | <!-- <el-option value="0" label=""></el-option> --> |
| | | <el-option v-for="col in filterColumns" :key="col.field" :value="col.field" :label="col.title" /> |
| | | </el-select> |
| | | </el-form-item> |
| | |
| | | <el-col :span="6"> |
| | | <el-form-item label="过滤1"> |
| | | <el-select v-model="query.ColName1" style="width:190px"> |
| | | <el-option value="0" label=""></el-option> |
| | | <!-- <el-option value="0" label=""></el-option> --> |
| | | <el-option v-for="col in filterColumns" :key="col.field" :value="col.field" :label="col.title" /> |
| | | </el-select> |
| | | </el-form-item> |
| | |
| | | <el-col :span="6"> |
| | | <el-form-item label="过滤2"> |
| | | <el-select v-model="query.ColName2" style="width:190px"> |
| | | <el-option value="0" label=""></el-option> |
| | | <!-- <el-option value="0" label=""></el-option> --> |
| | | <el-option v-for="col in filterColumns" :key="col.field" :value="col.field" :label="col.title" /> |
| | | </el-select> |
| | | </el-form-item> |
| | |
| | | HSourceBillNo: '', |
| | | Warehouse: '', |
| | | Hmaker: '', |
| | | ColName: '0', |
| | | Comparator: '0', |
| | | ColName: '', |
| | | Comparator: '', |
| | | ColContent: '', |
| | | ColName1: '0', |
| | | Comparator1: '0', |
| | | ColName1: '', |
| | | Comparator1: '', |
| | | ColContent1: '', |
| | | ColName2: '0', |
| | | Comparator2: '0', |
| | | ColName2: '', |
| | | Comparator2: '', |
| | | ColContent2: '' |
| | | }, |
| | | timeCycles: [ |
| | |
| | | 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" |
| | | v-model="queryParams.HBeginDate" |
| | | type="date" |
| | | value-format="yyyy-MM-dd" |
| | | type="daterange" |
| | | range-separator="-" |
| | | start-placeholder="开始日期" |
| | | end-placeholder="结束日期" |
| | | ></el-date-picker> |
| | | format="yyyy-MM-dd" |
| | | placeholder="开始日期" |
| | | style="width:160px" |
| | | :disabled="disableDataPicker" |
| | | /> |
| | | </el-form-item> |
| | | <el-form-item label="结束日期"> |
| | | <el-date-picker |
| | | v-model="queryParams.HEndDate" |
| | | type="date" |
| | | value-format="yyyy-MM-dd" |
| | | format="yyyy-MM-dd" |
| | | placeholder="结束日期" |
| | | style="width:160px" |
| | | :disabled="disableDataPicker" |
| | | /> |
| | | </el-form-item> |
| | | <el-form-item label="日期间隔"> |
| | | <el-select |
| | |
| | | ColContent2: "", |
| | | ColContent: "", |
| | | HInitTimeCycle: 29, |
| | | HBeginDate: dayjs(new Date()).subtract(29, "d").format("YYYY-MM-DDTHH:mm:ss"), |
| | | HEndDate: dayjs(new Date()).format("YYYY-MM-DDTHH:mm:ss"), |
| | | HBeginDate: dayjs(new Date()).subtract(29, "d").format("YYYY-MM-DD"), |
| | | HEndDate: dayjs(new Date()).format("YYYY-MM-DD"), |
| | | }, |
| | | // 显示搜索条件 |
| | | showSearch: true, |
| | |
| | | const start = dayjs(new Date()) |
| | | .subtract(this.queryParams.HInitTimeCycle, "d") |
| | | .format("YYYY-MM-DD"); |
| | | // 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 yyyyE = end.getFullYear(); |
| | | // const mmE = String(end.getMonth() + 1).padStart(2, "0"); // 月份是从0开始的 |
| | | // const ddE = String(end.getDate()).padStart(2, "0"); |
| | | this.sTime = start; |
| | | this.eTime = end; |
| | | |
| | | this.queryParams.HBeginDate = start; |
| | | this.queryParams.HEndDate = end; |
| | | this.dateRange = [this.sTime, this.eTime]; |
| | | }, |
| | | organizationChange(val) { |
| | |
| | | // this.sWhere += ` and CONVERT(varchar(100),日期, 23) >= '2020-01-01' and CONVERT(varchar(100),日期, 23) <= '2030-01-01'`; |
| | | // 收料通知单列表 |
| | | |
| | | if (this.dateRange.length > 0) { |
| | | if (this.queryParams.HBeginDate && this.queryParams.HEndDate) { |
| | | this.sWhere += |
| | | " and CONVERT(varchar(100),日期, 23) >= '" + this.dateRange[0] + "'"; |
| | | " and CONVERT(varchar(100),日期, 23) >= '" + this.queryParams.HBeginDate + "'"; |
| | | this.sWhere += |
| | | " and CONVERT(varchar(100),日期, 23) <= '" + this.dateRange[1] + "'"; |
| | | " and CONVERT(varchar(100),日期, 23) <= '" + this.queryParams.HEndDate + "'"; |
| | | } |
| | | |
| | | try { |
| | |
| | | //选中行高亮样式 |
| | | rowStyle({ row, rowIndex }) { |
| | | if (this.ids.includes(row.HItemID)) { |
| | | return { background: "#ecf5ff" }; |
| | | return { }; |
| | | } |
| | | }, |
| | | //双击行 |