RuoYi-Vue
New file @@ -0,0 +1 @@ Subproject commit 8a1cf9ed55747229ce4149ddacf8596fa0995814 src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue
@@ -3,7 +3,7 @@ <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="set_CheckBill(0, form)">审 核</el-button> --> <el-button type="primary" @click="close">退 出</el-button> <!-- <el-button @click="cancel">取 消</el-button> --> </div> @@ -265,31 +265,31 @@ <span>{{ scope.row.规格型号 }}</span> </template> </el-table-column> <el-table-column align="center" label="HUnitID" width="120"> <!-- <el-table-column align="center" label="HUnitID" width="120"> <template slot-scope="scope"> <span>{{ scope.row.HUnitID }}</span> </template> </el-table-column> </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="HPropertyID" width="120"> <!-- <el-table-column align="center" label="HPropertyID" width="120"> <template slot-scope="scope"> <span>{{ scope.row.HPropertyID }}</span> </template> </el-table-column> </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"> <!-- <el-table-column align="center" label="换算率" width="120"> <template slot-scope="scope"> <span>{{ scope.row.HSecUnitRate }}</span> </template> </el-table-column> </el-table-column> --> <el-table-column align="center" label="应发数量" width="120"> <template slot-scope="scope"> <span>{{ scope.row.HQtyMust }}</span> @@ -307,7 +307,7 @@ controls-position="right"></el-input-number> </template> </el-table-column> <el-table-column align="center" label="单价" width="140"> <!-- <el-table-column align="center" label="单价" width="140"> <template slot-scope="scope"> <el-input-number v-model="scope.row.HPrice" :min="0" style="width: 120px;" controls-position="right"></el-input-number> @@ -328,7 +328,7 @@ <template slot-scope="scope"> <span>{{scope.row.HOutMoney = scope.row.HOutPrice * scope.row.HQty }}</span> </template> </el-table-column> </el-table-column>--> <el-table-column align="center" label="HWHID" width="120"> <template slot-scope="scope"> <span>{{scope.row.HWHID}}</span> @@ -571,12 +571,12 @@ HSecManagerName: "", HKeeperID: 0, HKeeperName: "", HDeptID: 0, HDeptName: "", HDeptID: sessionStorage["HDeptID"], HDeptName: sessionStorage["HDept"], HManagerID: 0, HMangerName: "", HEmpID: 0, HEmpName: "", HEmpID: sessionStorage["HEmpID"], HEmpName: sessionStorage["HEmpName"], HSourceBillType: "", HExplanation :"", HRemark: "", @@ -834,6 +834,8 @@ this.gySupplierShow = true this.openData = true } else if (num == 9) { this.openPageData.HWHName = '' this.$nextTick() if(this.HSPType==1){ if(this.editData[this.zbIndex].HWHName){ this.dialogTitle = '仓位列表' @@ -871,6 +873,7 @@ this.gyEmployeeShow = false this.gySupplierShow = false this.Kf_MoveStockRequestBillShow = false this.gyStockPlaceShow = false }, //#endregion //#endregion @@ -887,28 +890,40 @@ this.form.HWHName = deptRow.仓库名称 this.form.HWHID = deptRow.HItemID this.form.HWHNumber = deptRow.仓库代码 this.form.HSPID = 1 this.form.HSPName = '' for (let i = 0; i < this.editData.length; i++) { this.editData[i].HWHID = deptRow.HItemID this.editData[i].HWHNumber = deptRow.仓库代码 this.editData[i].HWHName = deptRow.仓库名称 this.editData[i].HSPID = 1 this.editData[i].HSPName = '' } }else if(this.eHWHType == 2){ this.form.HSCWHName = deptRow.仓库名称 this.form.HSCWHID = deptRow.HItemID this.form.HSCWHNumber = deptRow.仓库代码 this.form.HSCSPID = 1 this.form.HSCSPName = '' for (let i = 0; i < this.editData.length; i++) { this.editData[i].HSCWHID = deptRow.HItemID this.editData[i].HSCWHNumber = deptRow.仓库代码 this.editData[i].HSCWHName = deptRow.仓库名称 this.editData[i].HSCSPID = 1 this.editData[i].HSCSPName = '' } }else if(this.eHWHType == 3){ this.editData[this.zbIndex].HWHID = deptRow.HItemID this.editData[this.zbIndex].HWHNumber = deptRow.仓库代码 this.editData[this.zbIndex].HWHName = deptRow.仓库名称 this.editData[this.zbIndex].HSPID = 1 this.editData[this.zbIndex].HSPName = '' }else if(this.eHWHType == 4){ this.editData[this.zbIndex].HSCWHID = deptRow.HItemID this.editData[this.zbIndex].HSCWHNumber = deptRow.仓库代码 this.editData[this.zbIndex].HSCWHName = deptRow.仓库名称 this.editData[this.zbIndex].HSCSPID = 1 this.editData[this.zbIndex].HSCSPName = '' } this.warehouseShow = false this.openData = false @@ -1058,7 +1073,7 @@ if (response.data.count == 1) { this.subDisabled = true//设置保存按钮不可用 this.$modal.msgSuccess(response.data.Message); this.get_MAXNum_Task(1);//设置流水号增加 // this.get_MAXNum_Task(1);//设置流水号增加 if (response.data.Verify == "Y") //自动审核 { this.set_CheckBill(0, this.form); //审核 @@ -1129,8 +1144,8 @@ 规格型号: '', HUnitID: 0, 计量单位: '', HQtyMust: 1, HQty: 1, HQtyMust: 0, HQty: 0, HPieceQty: 0, HPrice: 0, HTaxPrice: 0, @@ -1140,7 +1155,7 @@ HWHID: 0, 发货仓库: '', HRemark: '', HQty_Full: 0, HQty_Full:0, HQty_Empty: 0, HQty_Back: 0, HCostPrice: 0, src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
@@ -3,7 +3,7 @@ <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(1, form)">审 核</el-button> <!-- <el-button type="primary" @click="set_CheckBill(1, form)">审 核</el-button> --> <el-button type="primary" @click="close">退 出</el-button> <!-- <el-button @click="cancel">取 消</el-button> --> </div> @@ -14,7 +14,7 @@ <el-row> <el-col :span="6"> <el-form-item v-show="HIsShow" label="单据号" prop="HBillNo"> <el-input v-model="form.HBillNo" placeholder="请输入单据号" /> <el-input v-model="form.HBillNo" placeholder="请输入单据号" disabled/> </el-form-item> </el-col> <el-col :span="6"> src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
@@ -3,7 +3,7 @@ <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(1, form)">审 核</el-button> <!-- <el-button type="primary" @click="set_CheckBill(1, form)">审 核</el-button> --> <el-button type="primary" @click="close">退 出</el-button> <!-- <el-button @click="cancel">取 消</el-button> --> </div> @@ -14,7 +14,7 @@ <el-row> <el-col :span="6"> <el-form-item v-show="HIsShow" label="单据号" prop="HBillNo"> <el-input v-model="form.HBillNo" placeholder="请输入单据号" /> <el-input v-model="form.HBillNo" placeholder="请输入单据号" disabled/> </el-form-item> </el-col> <el-col :span="6"> src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
@@ -131,10 +131,10 @@ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single" @click="handleEdit(row = rowForm, OperationType = 2)">编辑</el-button> </el-col> <el-col :span="1.5"> <!-- <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-col> </el-col> --> <el-col :span="1.5"> <el-button type="primary" icon="el-icon-tickets" size="mini" @click="handlePush(row = rowForm, OperationType = 4)">下推（容器直接调拨单）</el-button> src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
@@ -3,7 +3,7 @@ <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(1, form)">审 核</el-button> <!-- <el-button type="primary" @click="set_CheckBill(1, form)">审 核</el-button> --> <el-button type="primary" @click="close">退 出</el-button> <!-- <el-button @click="cancel">取 消</el-button> --> </div> @@ -13,8 +13,8 @@ <el-tab-pane label="基本信息" name="first"> <el-row> <el-col :span="6"> <el-form-item v-show="HIsShow" label="单据号" prop="HBillNo"> <el-input v-model="form.HBillNo" placeholder="请输入单据号" /> <el-form-item v-show="HIsShow" label="单据号" prop="HBillNo" > <el-input v-model="form.HBillNo" placeholder="请输入单据号" disabled/> </el-form-item> </el-col> <el-col :span="6"> @@ -105,21 +105,21 @@ </el-col> </el-row> <el-row> <el-col :span="6"> <!-- <el-col :span="6"> <el-form-item v-show="HIsShow" label="源单类型" prop="HSourceBillType"> <el-select v-model="form.HSourceBillType" placeholder="请选择"> <el-option v-for="(item, index) in HSourceBillTypes" :key="index" :label="item.HSourceBillTypeName" :value="item.HSourceBillType"> </el-option> </el-select> </el-form-item> </el-col> <el-col :span="6"> </el-col> --> <!-- <el-col :span="6"> <el-form-item v-show="HIsShow" label="源单单号" prop="HSourceBillNo"> <el-input placeholder="请选择源单单号" disabled> <el-button slot="append" icon="el-icon-search" @click="get_checkMainSource()"></el-button> </el-input> </el-form-item> </el-col> </el-col> --> </el-row> <el-row> <el-col :span="12"> @@ -431,15 +431,15 @@ HBillSubType: [ { required: true, message: "子单据类型不能为空", trigger: "blur" } ], HEmpName: [ { required: true, message: "业务员不能为空", trigger: "blur" } ], HSecManagerName: [ { required: true, message: "验收员不能为空", trigger: "blur" } ], HKeeperName: [ { required: true, message: "保管员不能为空", trigger: "blur" } ] // HEmpName: [ // { required: true, message: "业务员不能为空", trigger: "blur" } // ], // HSecManagerName: [ // { required: true, message: "验收员不能为空", trigger: "blur" } // ], // HKeeperName: [ // { required: true, message: "保管员不能为空", trigger: "blur" } // ] } }; }, src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
@@ -135,10 +135,10 @@ <el-button type="primary" icon="el-icon-Pallet" size="mini" :disabled="single" @click="set_PalletChange">托数变更 </el-button> </el-col> <el-col :span="1.5"> <!-- <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-col> </el-col> --> <el-col :span="1.5"> <el-button type="primary" icon="el-icon-tickets" size="mini" @click="handlePush(row = rowForm, OperationType = 4)">下推（容器领用出库单）</el-button> src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
@@ -3,7 +3,7 @@ <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(1, form)">审 核</el-button> <!-- <el-button type="primary" @click="set_CheckBill(1, form)">审 核</el-button> --> <el-button type="primary" @click="close">退 出</el-button> <!-- <el-button @click="cancel">取 消</el-button> --> </div> @@ -14,7 +14,7 @@ <el-row> <el-col :span="6"> <el-form-item v-show="HIsShow" label="单据号" prop="HBillNo"> <el-input v-model="form.HBillNo" placeholder="请输入单据号" /> <el-input v-model="form.HBillNo" placeholder="请输入单据号" disabled/> </el-form-item> </el-col> <el-col :span="6"> src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
@@ -135,10 +135,10 @@ <el-button type="primary" icon="el-icon-Pallet" size="mini" :disabled="single" @click="set_PalletChange">托数变更 </el-button> </el-col> <el-col :span="1.5"> <!-- <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-col> </el-col> --> <el-col :span="1.5"> <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">删除 </el-button> src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
@@ -3,7 +3,7 @@ <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(1, form)">审 核</el-button> <!-- <el-button type="primary" @click="set_CheckBill(1, form)">审 核</el-button> --> <el-button type="primary" @click="close">退 出</el-button> <!-- <el-button @click="cancel">取 消</el-button> --> </div> @@ -14,7 +14,7 @@ <el-row> <el-col :span="6"> <el-form-item v-show="HIsShow" label="单据号" prop="HBillNo"> <el-input v-model="form.HBillNo" placeholder="请输入单据号" /> <el-input v-model="form.HBillNo" placeholder="请输入单据号" disabled/> </el-form-item> </el-col> <el-col :span="6"> src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue
@@ -131,10 +131,10 @@ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single" @click="handleEdit(row = rowForm, OperationType = 2)">编辑</el-button> </el-col> <el-col :span="1.5"> <!-- <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-col> </el-col> --> <el-col :span="1.5"> <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">删除 </el-button> src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
@@ -3,7 +3,7 @@ <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(1, form)">审 核</el-button> <!-- <el-button type="primary" @click="set_CheckBill(1, form)">审 核</el-button> --> <el-button type="primary" @click="close">退 出</el-button> <!-- <el-button @click="cancel">取 消</el-button> --> </div> @@ -14,7 +14,7 @@ <el-row> <el-col :span="6"> <el-form-item v-show="HIsShow" label="单据号" prop="HBillNo"> <el-input v-model="form.HBillNo" placeholder="请输入单据号" /> <el-input v-model="form.HBillNo" placeholder="请输入单据号" disabled/> </el-form-item> </el-col> <el-col :span="6"> src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
@@ -135,10 +135,10 @@ <el-button type="primary" icon="el-icon-Pallet" size="mini" :disabled="single" @click="set_PalletChange">托数变更 </el-button> </el-col> <el-col :span="1.5"> <!-- <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-col> </el-col> --> <el-col :span="1.5"> <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">删除 </el-button>
