|
|
@@ -446,23 +446,7 @@
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="仓库" prop="fWarehouseid">
|
|
|
- <el-select
|
|
|
- v-model="form.fWarehouseid"
|
|
|
- filterable
|
|
|
- remote
|
|
|
- @change="changefWarehouseid(form)"
|
|
|
- :disabled="browseStatus || formBrowseStatus"
|
|
|
- style="width: 80%"
|
|
|
- :remote-method="warehouseRemoteMethod"
|
|
|
- placeholder="请输入模糊查找"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(dict, index) in warehouseOptions"
|
|
|
- :key="index.fId"
|
|
|
- :label="dict.fName"
|
|
|
- :value="dict.fId"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
+ <treeselect style="width:80%" v-model="form.fWarehouseid" :options="warehousesOptions" :show-count="true" placeholder="请选择归属库区" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -870,6 +854,33 @@
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
<el-table-column label="序号" type="index" width="80">
|
|
|
</el-table-column>
|
|
|
+
|
|
|
+ <el-table-column
|
|
|
+ prop="fBsdate"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="150px"
|
|
|
+ label="入库日期"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="scope.row.fBsdate"
|
|
|
+ style="width: 138px"
|
|
|
+ :disabled="
|
|
|
+ browseStatus ||
|
|
|
+ scope.row.fBillstatus === 20 ||
|
|
|
+ scope.row.fBillstatus === 30 ||
|
|
|
+ scope.row.fBillstatus === 40
|
|
|
+ "
|
|
|
+ type="date"
|
|
|
+ value-format="timestamp"
|
|
|
+ placeholder="业务日期"
|
|
|
+ >
|
|
|
+ </el-date-picker>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+
|
|
|
+
|
|
|
<el-table-column
|
|
|
prop="fMblno"
|
|
|
header-align="center"
|
|
|
@@ -2541,7 +2552,7 @@ import { listCorps } from "@/api/basicdata/corps";
|
|
|
|
|
|
import { listFees, getFees } from "@/api/basicdata/fees";
|
|
|
|
|
|
-import { listWarehouse } from "@/api/basicdata/warehouse";
|
|
|
+import { listWarehouse, treeselect } from '@/api/basicdata/warehouse'
|
|
|
|
|
|
import { listArea } from "@/api/basicdata/area";
|
|
|
|
|
|
@@ -2555,6 +2566,8 @@ import { listWhgenleg } from "@/api/reportManagement/whgenleg";
|
|
|
import Global from '@/layout/components/global'
|
|
|
import AddOrUpdate from "@/views/viewApproval";
|
|
|
import ApprovalComments from '@/views/startApproval'
|
|
|
+import Treeselect from "@riophae/vue-treeselect";
|
|
|
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
|
|
|
|
|
export default {
|
|
|
name: "Warehousebills",
|
|
|
@@ -2562,9 +2575,12 @@ export default {
|
|
|
UploadFile,
|
|
|
AddOrUpdate,
|
|
|
ApprovalComments,
|
|
|
+ Treeselect
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ // 部门树选项
|
|
|
+ warehousesOptions: undefined,
|
|
|
//控制作业类型校验
|
|
|
isrequired:2,
|
|
|
isrequired_s:2,
|
|
|
@@ -2778,7 +2794,7 @@ export default {
|
|
|
message: " ",
|
|
|
trigger: "blur",
|
|
|
},
|
|
|
- // fWarehouseid: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
+ fWarehouseid: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
// fBscorpno: [
|
|
|
// { required: true, message: "请输入存货编号", trigger: "blur" },
|
|
|
// ],
|
|
|
@@ -2836,9 +2852,17 @@ export default {
|
|
|
this.adoPt()
|
|
|
},
|
|
|
methods: {
|
|
|
+ /** 查询部门下拉树结构 */
|
|
|
+ getTreeselect() {
|
|
|
+ treeselect().then(response => {
|
|
|
+ this.warehousesOptions = response.data;
|
|
|
+ });
|
|
|
+ },
|
|
|
+ //审批页面跳转
|
|
|
adoPt(){
|
|
|
this.approval = this.$route.query.data
|
|
|
if (this.approval){
|
|
|
+ this.getTreeselect()
|
|
|
this.reset();
|
|
|
this.doNot = true
|
|
|
this.closeButton = false
|
|
|
@@ -3630,6 +3654,7 @@ export default {
|
|
|
},
|
|
|
/** 新增按钮操作 */
|
|
|
handleAdd(status) {
|
|
|
+ this.getTreeselect();
|
|
|
this.reset();
|
|
|
this.browseStatus = status;
|
|
|
this.queryUser();
|
|
|
@@ -3646,6 +3671,7 @@ export default {
|
|
|
},
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row, status) {
|
|
|
+ this.getTreeselect();
|
|
|
this.reset();
|
|
|
// if (this.dataList.length === 0){
|
|
|
// this.contrOl = true
|
wengyuwen