|
@@ -151,10 +151,10 @@
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="唛头" prop="fMarks">
|
|
|
+ <el-form-item label="品牌" prop="fMarks">
|
|
|
<el-input
|
|
|
v-model="queryParams.fMarks"
|
|
|
- placeholder="请输入唛头"
|
|
|
+ placeholder="请输入品牌"
|
|
|
clearable
|
|
|
size="small"
|
|
|
style="width: 80%"
|
|
@@ -249,7 +249,7 @@
|
|
|
prop="fCorpid"
|
|
|
/>
|
|
|
<el-table-column label="提单号" align="center" prop="fMblno" />
|
|
|
- <el-table-column label="唛头" align="center" prop="fMarks" />
|
|
|
+ <el-table-column label="品牌" align="center" prop="fMarks" />
|
|
|
<el-table-column
|
|
|
label="出库日期"
|
|
|
align="center"
|
|
@@ -574,12 +574,12 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="唛头" prop="fMarks">
|
|
|
+ <el-form-item label="品牌" prop="fMarks">
|
|
|
<el-input
|
|
|
v-model="form.fMarks"
|
|
|
style="width: 80%"
|
|
|
:disabled="browseStatus || formBrowseStatus"
|
|
|
- placeholder="唛头"
|
|
|
+ placeholder="品牌"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
@@ -730,6 +730,15 @@
|
|
|
@click.prevent="addRelevant(10)"
|
|
|
>新行
|
|
|
</el-button>
|
|
|
+ <!-- <el-button :disabled="browseStatus" @click.prevent="deleteRow(warehouseDrList)"
|
|
|
+ >删除
|
|
|
+ </el-button> -->
|
|
|
+ <el-button type="primary" :disabled="browseStatus" @click="saveForm">保 存</el-button>
|
|
|
+ </div>
|
|
|
+ <div style="display: flex">
|
|
|
+ <el-button @click="detailsHidden ? (detailsHidden = false) : (detailsHidden = true)">{{ detailsHidden ? "隐藏" : "展开" }}</el-button>
|
|
|
+ <el-button type="info" :disabled="printinglist.length <= 0" prop="打印" @click="printJobSheet">作业单</el-button>
|
|
|
+ <el-button :disabled="printinglist.length <= 0" @click="discharge">装货</el-button>
|
|
|
<el-button
|
|
|
:disabled="dataListSelection.length <= 0 || browseStatus"
|
|
|
@click.prevent="creditClick"
|
|
@@ -740,19 +749,10 @@
|
|
|
@click.prevent="withdrawClick"
|
|
|
>撤回出库</el-button
|
|
|
>
|
|
|
- <!-- <el-button :disabled="browseStatus" @click.prevent="deleteRow(warehouseDrList)"
|
|
|
- >删除
|
|
|
- </el-button> -->
|
|
|
- <el-button type="primary" :disabled="browseStatus" @click="saveForm">保 存</el-button>
|
|
|
- </div>
|
|
|
- <div style="display: flex">
|
|
|
- <el-button @click="detailsHidden ? (detailsHidden = false) : (detailsHidden = true)">{{ detailsHidden ? "隐藏" : "展开" }}</el-button>
|
|
|
- <el-button type="info" :disabled="printinglist.length <= 0" prop="打印" @click="printJobSheet">作业单</el-button>
|
|
|
- <el-button :disabled="printinglist.length <= 0" @click="discharge">装货</el-button>
|
|
|
<el-button type="warning" prop="打印" :disabled="printinglist.length <= 0" @click="showEditDialog_s"
|
|
|
>出库单
|
|
|
</el-button>
|
|
|
- <el-button type="primary" :disabled="browseStatus" @click="saveForm">保 存</el-button>
|
|
|
+ <!-- <el-button type="primary" :disabled="browseStatus" @click="saveForm">保 存</el-button> -->
|
|
|
<el-button
|
|
|
style="background-color: #008000; color: #fff"
|
|
|
@click="submitForm(6)"
|
|
@@ -805,7 +805,7 @@
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
width="140px"
|
|
|
- label="*唛头"
|
|
|
+ label="*品牌"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
@@ -1781,7 +1781,7 @@
|
|
|
prop="fMarks"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
- label="唛头"
|
|
|
+ label="品牌"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
@@ -3450,6 +3450,7 @@ export default {
|
|
|
for (let li in this.dataList) {
|
|
|
if (this.dataList[li].fId === dataitem[ite].fId) {
|
|
|
this.$set(this.dataList[li], 'fBillstatus', dataitem[ite].fBillstatus)
|
|
|
+ this.$set(this.dataList[li], 'fSerialNumber', dataitem[ite].fSerialNumber)
|
|
|
}
|
|
|
}
|
|
|
}
|