|
|
@@ -72,7 +72,7 @@
|
|
|
style="width: 80%"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
:remote-method="corpsRemoteMethod"
|
|
|
- placeholder="请输入"
|
|
|
+ placeholder="请输入模糊查找"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(dict, index) in fMblnoOptions"
|
|
|
@@ -103,7 +103,7 @@
|
|
|
placeholder="请选择经营单位"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="(dict, index) in fSbuOptions"
|
|
|
+ v-for="(dict, index) in fMblnoOptions"
|
|
|
:key="index.fId"
|
|
|
:label="dict.fName"
|
|
|
:value="dict.fId"
|
|
|
@@ -312,10 +312,11 @@
|
|
|
v-model="form.fCorpid"
|
|
|
filterable
|
|
|
remote
|
|
|
+ @change="changefCorpid(form)"
|
|
|
:disabled="browseStatus"
|
|
|
style="width: 80%"
|
|
|
:remote-method="corpsRemoteMethod"
|
|
|
- placeholder="请输入"
|
|
|
+ placeholder="请输入模糊查找"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(dict, index) in fMblnoOptions"
|
|
|
@@ -380,7 +381,7 @@
|
|
|
:disabled="browseStatus"
|
|
|
style="width: 80%"
|
|
|
:remote-method="userRemoteMethod"
|
|
|
- placeholder="请输入"
|
|
|
+ placeholder="请输入模糊查找"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(dict, index) in userOptions"
|
|
|
@@ -400,7 +401,7 @@
|
|
|
remote
|
|
|
style="width: 80%"
|
|
|
:remote-method="warehouseRemoteMethod"
|
|
|
- placeholder="请输入"
|
|
|
+ placeholder="请输入模糊查找"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(dict, index) in warehouseOptions"
|
|
|
@@ -645,7 +646,7 @@
|
|
|
placeholder="请选择经营单位"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="(dict, index) in fSbuOptions"
|
|
|
+ v-for="(dict, index) in fMblnoOptions"
|
|
|
:key="index.fId"
|
|
|
:label="dict.fName"
|
|
|
:value="dict.fId"
|
|
|
@@ -769,7 +770,6 @@
|
|
|
v-model="scope.row.fBsdate"
|
|
|
style="width: 138px"
|
|
|
type="date"
|
|
|
- disabled
|
|
|
value-format="timestamp"
|
|
|
placeholder="入库日期"
|
|
|
>
|
|
|
@@ -802,6 +802,31 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
+ prop="fWarehouselocid"
|
|
|
+ header-align="center"
|
|
|
+ width="140px"
|
|
|
+ align="center"
|
|
|
+ label="库区"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-select
|
|
|
+ v-model="scope.row.fWarehouselocid"
|
|
|
+ filterable
|
|
|
+ remote
|
|
|
+ :disabled="browseStatus"
|
|
|
+ :remote-method="kqhouseRemoteMethod"
|
|
|
+ placeholder="请选择库区"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(dict, index) in kqhouseOptions"
|
|
|
+ :key="index.fId"
|
|
|
+ :label="dict.fName"
|
|
|
+ :value="dict.fId"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
prop="fcntrtype"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
@@ -970,31 +995,7 @@
|
|
|
/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fWarehouselocid"
|
|
|
- header-align="center"
|
|
|
- width="140px"
|
|
|
- align="center"
|
|
|
- label="库区"
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-select
|
|
|
- v-model="scope.row.fWarehouselocid"
|
|
|
- filterable
|
|
|
- remote
|
|
|
- :disabled="browseStatus"
|
|
|
- :remote-method="kqhouseRemoteMethod"
|
|
|
- placeholder="请选择库区"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(dict, index) in kqhouseOptions"
|
|
|
- :key="index.fId"
|
|
|
- :label="dict.fName"
|
|
|
- :value="dict.fId"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
+
|
|
|
<el-table-column
|
|
|
prop="fCntrno"
|
|
|
header-align="center"
|
|
|
@@ -1296,7 +1297,7 @@
|
|
|
v-model="scope.row.fQty"
|
|
|
placeholder="数量"
|
|
|
:disabled="browseStatus"
|
|
|
- @change="changeEstmateAmt(scope.row)"
|
|
|
+ @change="changeContractAmt(scope.row)"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
</template>
|
|
|
@@ -1739,7 +1740,7 @@
|
|
|
<td width="100">某某</td>
|
|
|
<td width="100">包</td>
|
|
|
<td width="100">吨</td>
|
|
|
- <td width="100">50kg</td>
|
|
|
+ <td width="100"></td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td width="100">序号</td>
|
|
|
@@ -1751,7 +1752,7 @@
|
|
|
<td width="100">入库件数</td>
|
|
|
</tr>
|
|
|
<tr v-for="(item,index) in Printinglist" :key="index">
|
|
|
- <td width="100">1</td>
|
|
|
+ <td width="100">{{index+1}}</td>
|
|
|
<td width="100">{{item.fBsdate}}</td>
|
|
|
<td width="100">{{item.fCntqty}}</td>
|
|
|
<td width="100">{{item.fGrossweight}}</td>
|
|
|
@@ -2013,7 +2014,6 @@ export default {
|
|
|
fBsdate: '',
|
|
|
fCntrtype: '',
|
|
|
fGoodsids: '',
|
|
|
- fPlangrossweight: "",
|
|
|
fPlannetweight: "",
|
|
|
fPlanvolumn: "",
|
|
|
fPlanqty: "",
|
|
|
@@ -2278,19 +2278,30 @@ export default {
|
|
|
},
|
|
|
// 收货单打印界面
|
|
|
showEditDialog_s() {
|
|
|
-
|
|
|
- for(let corp in this.fMblnoOptions){
|
|
|
- if(this.form.fCorpId === this.fMblnoOptions[corp].fId) {
|
|
|
- this.fMblnoOptions[corp].fName
|
|
|
- console.log(this.fMblnoOptions[corp].fName)
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
- console.log(this.form)
|
|
|
+ if(this.Printinglist.length>0) {
|
|
|
this.editDialogVisible_s = true;
|
|
|
+ for(let corp in this.fMblnoOptions){
|
|
|
+ if(this.form.fCorpid === this.fMblnoOptions[corp].fId) {
|
|
|
+ this.$set(this.form, "fCorpid", this.fMblnoOptions[corp].fName);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ for(let sorp in this.warehouseOptions){
|
|
|
+ console.log(this.form.fWarehouseid)
|
|
|
+ if(this.form.fWarehouseid === this.warehouseOptions[sorp].fId) {
|
|
|
+ this.$set(this.form, "fWarehouseid", this.warehouseOptions[sorp].fName);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ this.$message.error("请选择需要打印的明细!");
|
|
|
+ }
|
|
|
+
|
|
|
},
|
|
|
showEditDialog_ss() {
|
|
|
+ if(this.Printinglist.length>0) {
|
|
|
this.editDialogVisible_ss = true;
|
|
|
+ }else {
|
|
|
+ this.$message.error("请选择需要打印的明细!");
|
|
|
+ }
|
|
|
},
|
|
|
showEditDialog_sss() {
|
|
|
this.editDialogVisible_sss = true;
|
|
|
@@ -2479,12 +2490,13 @@ export default {
|
|
|
this.dataListSelection = selection;
|
|
|
if (this.Printinglist.length > 0) {
|
|
|
this.fTruckno = selection[0].fTruckno;
|
|
|
- this.fBsdate = selection[0].fBsdate;
|
|
|
+ this.fBsdate = new Date(selection[0].fBsdate)
|
|
|
this.fCntrtype = selection[0].fCntrtype;
|
|
|
this.fGoodsids = selection[0].fGoodsids;
|
|
|
}
|
|
|
|
|
|
},
|
|
|
+
|
|
|
// 收款选择
|
|
|
Collectionoptions(selection) {
|
|
|
console.log(selection)
|
|
|
@@ -2714,6 +2726,11 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
+ changefCorpid(row) {
|
|
|
+ console.log(row)
|
|
|
+ this.$set(row, "fSbu", row.fCorpid);
|
|
|
+
|
|
|
+ },
|
|
|
// 变更计价单位
|
|
|
changeFeeUnit(row) {
|
|
|
console.log(this.fCntqty);
|
|
|
@@ -2773,6 +2790,7 @@ export default {
|
|
|
},
|
|
|
/** 提交按钮 */
|
|
|
submitForm(status) {
|
|
|
+ console.log(this.warehouseDrList);
|
|
|
this.$refs["form"].validate((valid) => {
|
|
|
if (status === 2) {
|
|
|
console.log("@@");
|
tong