|
@@ -74,7 +74,7 @@
|
|
|
placeholder="请输入关键词"
|
|
|
style="width: 80%"
|
|
|
@change="changefStltype"
|
|
|
- :disabled="detailList.length > 0 || form.warehouseStatus > 3"
|
|
|
+ :disabled="detailList.findIndex(function(item){return item.fBillstatus == 40}) == -1?false:true"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(item, index) in fMblnoOptions"
|
|
@@ -130,11 +130,7 @@
|
|
|
<el-form-item label="提单号" prop="fMblno">
|
|
|
<el-input
|
|
|
v-model="form.fMblno"
|
|
|
- :disabled="
|
|
|
- browseStatus ||
|
|
|
- detailList.length > 0 ||
|
|
|
- form.warehouseStatus > 3
|
|
|
- "
|
|
|
+ :disabled="detailList.findIndex(function(item){return item.fBillstatus == 40}) == -1?false:true"
|
|
|
style="width: 80%"
|
|
|
placeholder="请输入提单号"
|
|
|
v-Space
|
|
@@ -149,7 +145,7 @@
|
|
|
v-model="form.fBsdate"
|
|
|
style="width: 80%"
|
|
|
type="date"
|
|
|
- :disabled="browseStatus || form.warehouseStatus > 3"
|
|
|
+ :disabled="detailList.findIndex(function(item){return item.fBillstatus == 40}) == -1?false:true"
|
|
|
value-format="timestamp"
|
|
|
placeholder="请选择计划日期"
|
|
|
@change="changeDate"
|
|
@@ -161,7 +157,7 @@
|
|
|
<el-form-item label="入库时间" prop="fBstime">
|
|
|
<el-time-picker
|
|
|
style="width: 80%"
|
|
|
- :disabled="browseStatus || form.warehouseStatus > 3"
|
|
|
+ :disabled="detailList.findIndex(function(item){return item.fBillstatus == 40}) == -1?false:true"
|
|
|
v-model="form.fBstime"
|
|
|
:picker-options="{
|
|
|
selectableRange: '00:00:00 - 23:59:59',
|
|
@@ -178,7 +174,7 @@
|
|
|
<el-select
|
|
|
style="width: 80%"
|
|
|
v-model="form.fChargetype"
|
|
|
- :disabled="browseStatus || detailList.map(function(e) { return e.fBillstatus; }).indexOf(40) === -1?false:true || form.warehouseStatus > 3"
|
|
|
+ :disabled="detailList.findIndex(function(item){return item.fBillstatus == 40}) == -1?false:true"
|
|
|
placeholder="请选择仓储费方式"
|
|
|
>
|
|
|
<el-option label="实际入库日期" value="1"></el-option>
|
|
@@ -215,11 +211,7 @@
|
|
|
<el-select
|
|
|
v-model="form.fWarehouseid"
|
|
|
filterable
|
|
|
- :disabled="
|
|
|
- browseStatus ||
|
|
|
- detailList.length > 0 ||
|
|
|
- form.warehouseStatus > 3
|
|
|
- "
|
|
|
+ :disabled="detailList.findIndex(function(item){return item.fWarehouseInformation}) == -1?false:true"
|
|
|
style="width: 80%"
|
|
|
placeholder="请选择"
|
|
|
>
|
|
@@ -238,7 +230,7 @@
|
|
|
v-model="form.fStorekeeper"
|
|
|
filterable
|
|
|
clearable
|
|
|
- :disabled="browseStatus || form.warehouseStatus > 3"
|
|
|
+ :disabled="detailList.findIndex(function(item){return item.fBillstatus == 40}) == -1?false:true"
|
|
|
style="width: 80%"
|
|
|
placeholder="请输入模糊查找"
|
|
|
>
|
|
@@ -259,7 +251,6 @@
|
|
|
v-model="form.fEta"
|
|
|
style="width: 80%"
|
|
|
type="date"
|
|
|
- :disabled="browseStatus || form.warehouseStatus > 3"
|
|
|
value-format="timestamp"
|
|
|
placeholder="到港日期"
|
|
|
>
|
|
@@ -272,7 +263,6 @@
|
|
|
v-model="form.freeContainerDate"
|
|
|
style="width: 80%"
|
|
|
type="date"
|
|
|
- :disabled="browseStatus || form.warehouseStatus > 3"
|
|
|
value-format="timestamp"
|
|
|
placeholder="请选择箱使日期"
|
|
|
>
|
|
@@ -292,7 +282,6 @@
|
|
|
<el-input
|
|
|
v-model="form.fCustomno"
|
|
|
style="width: 80%"
|
|
|
- :disabled="browseStatus || form.warehouseStatus > 3"
|
|
|
placeholder="报关单号"
|
|
|
/>
|
|
|
</el-form-item>
|
|
@@ -545,7 +534,6 @@
|
|
|
style="width: 80%"
|
|
|
v-model="form.remark"
|
|
|
type="textarea"
|
|
|
- :disabled="browseStatus || form.warehouseStatus > 3"
|
|
|
placeholder="请输入内容"
|
|
|
/>
|
|
|
</el-form-item>
|
|
@@ -556,7 +544,6 @@
|
|
|
style="width: 80%"
|
|
|
v-model="form.fRemarksFees"
|
|
|
type="textarea"
|
|
|
- :disabled="browseStatus || form.warehouseStatus > 3"
|
|
|
placeholder="请输入内容"
|
|
|
/>
|
|
|
</el-form-item>
|
|
@@ -656,7 +643,6 @@
|
|
|
<el-input
|
|
|
v-model="form.fContacts"
|
|
|
style="width: 80%"
|
|
|
- :disabled="browseStatus || form.warehouseStatus > 3"
|
|
|
placeholder="仓库联系人"
|
|
|
/>
|
|
|
</el-form-item>
|
|
@@ -665,7 +651,6 @@
|
|
|
<el-form-item label="仓库电话" prop="fTel">
|
|
|
<el-input
|
|
|
v-model="form.fTel"
|
|
|
- :disabled="browseStatus || form.warehouseStatus > 3"
|
|
|
style="width: 80%"
|
|
|
placeholder="请输仓库入电话"
|
|
|
/>
|
|
@@ -676,7 +661,6 @@
|
|
|
<el-input
|
|
|
v-model="form.fVslvoy"
|
|
|
style="width: 80%"
|
|
|
- :disabled="browseStatus || form.warehouseStatus > 3"
|
|
|
placeholder="船名航次"
|
|
|
/>
|
|
|
</el-form-item>
|
|
@@ -832,7 +816,6 @@
|
|
|
v-model="form.fIfpledge"
|
|
|
placeholder="请选择是否质押"
|
|
|
clearable
|
|
|
- :disabled="browseStatus || form.warehouseStatus > 3"
|
|
|
style="width: 80%"
|
|
|
>
|
|
|
<el-option
|
|
@@ -851,7 +834,6 @@
|
|
|
filterable
|
|
|
clearable
|
|
|
style="width: 80%"
|
|
|
- :disabled="browseStatus || form.warehouseStatus > 3"
|
|
|
placeholder="请输入关键词"
|
|
|
>
|
|
|
<el-option
|
|
@@ -871,7 +853,6 @@
|
|
|
v-model="form.fBusinessAttribution"
|
|
|
placeholder="请选择业务归属"
|
|
|
clearable
|
|
|
- :disabled="browseStatus || form.warehouseStatus > 3"
|
|
|
style="width: 80%"
|
|
|
>
|
|
|
<el-option
|
|
@@ -891,7 +872,6 @@
|
|
|
filterable
|
|
|
placeholder="请输入关键词"
|
|
|
style="width: 80%"
|
|
|
- :disabled="browseStatus || form.warehouseStatus > 3"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(item, index) in fMblnoOptions"
|
|
@@ -908,7 +888,6 @@
|
|
|
v-model.number="form.fDeclarationElements"
|
|
|
style="width: 80%"
|
|
|
placeholder="申报要素"
|
|
|
- :disabled="browseStatus || form.warehouseStatus > 3"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
@@ -921,7 +900,6 @@
|
|
|
style="width: 80%"
|
|
|
placeholder="料件号"
|
|
|
v-input-limit="0"
|
|
|
- :disabled="browseStatus || form.warehouseStatus > 3"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
@@ -931,7 +909,6 @@
|
|
|
v-model="form.fIfinspection"
|
|
|
placeholder="是否法检"
|
|
|
clearable
|
|
|
- :disabled="browseStatus || form.warehouseStatus > 3"
|
|
|
style="width: 80%"
|
|
|
>
|
|
|
<el-option
|
|
@@ -944,27 +921,30 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8" v-if="showfValue == 0">
|
|
|
- <el-form-item label="货值" prop="fValue">
|
|
|
+ <el-form-item label="货值单价" prop="fValue">
|
|
|
<el-input
|
|
|
v-model="form.fValue"
|
|
|
style="width: 80%"
|
|
|
placeholder="货值"
|
|
|
- v-input-limit="2"
|
|
|
- :disabled="browseStatus || form.warehouseStatus > 3"
|
|
|
+ v-input-limit="4"
|
|
|
>
|
|
|
- <template slot="append">万$</template>
|
|
|
+ <template slot="append">美元</template>
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="8" v-if="showfWeighingDate == 0">
|
|
|
- <el-form-item label="过磅时间" prop="fWeighingDate">
|
|
|
+ <el-form-item label="过磅时间" prop="fWeighingDate"
|
|
|
+ :rules="{
|
|
|
+ required: weighedRequired == 0 ? true : false,
|
|
|
+ message: ' ',
|
|
|
+ trigger: ['blur', 'change'],
|
|
|
+ }">
|
|
|
<el-date-picker
|
|
|
v-model="form.fWeighingDate"
|
|
|
style="width: 80%"
|
|
|
type="date"
|
|
|
- :disabled="browseStatus || form.warehouseStatus > 3"
|
|
|
value-format="timestamp"
|
|
|
placeholder="请选择过磅时间"
|
|
|
>
|
|
@@ -972,12 +952,15 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8" v-if="showfWeighingDate == 0">
|
|
|
- <el-form-item label="过磅重量" prop="fWeighWeight">
|
|
|
+ <el-form-item label="过磅重量" prop="fWeighWeight" :rules="{
|
|
|
+ required: weighedRequired == 0 ? true : false,
|
|
|
+ message: ' ',
|
|
|
+ trigger: ['blur', 'change'],
|
|
|
+ }">
|
|
|
<el-input
|
|
|
v-model.number="form.fWeighWeight"
|
|
|
style="width: 80%"
|
|
|
placeholder="过磅重量"
|
|
|
- :disabled="browseStatus || form.warehouseStatus > 3"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
@@ -987,7 +970,6 @@
|
|
|
v-model="form.fIfsampling"
|
|
|
placeholder="是否取样"
|
|
|
clearable
|
|
|
- :disabled="browseStatus || form.warehouseStatus > 3"
|
|
|
style="width: 80%"
|
|
|
>
|
|
|
<el-option
|
|
@@ -1002,12 +984,16 @@
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="送样时间" prop="sendSampleDate">
|
|
|
+ <el-form-item label="送样时间" prop="sendSampleDate"
|
|
|
+ :rules="{
|
|
|
+ required: weighedRequired == 0 ? true : false,
|
|
|
+ message: ' ',
|
|
|
+ trigger: ['blur', 'change'],
|
|
|
+ }">
|
|
|
<el-date-picker
|
|
|
v-model="form.sendSampleDate"
|
|
|
style="width: 80%"
|
|
|
type="date"
|
|
|
- :disabled="browseStatus || form.warehouseStatus > 3"
|
|
|
value-format="timestamp"
|
|
|
placeholder="请选择送样时间"
|
|
|
>
|
|
@@ -1015,12 +1001,16 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="是否复磅" prop="fIfweightRecovery">
|
|
|
+ <el-form-item label="是否复磅" prop="fIfweightRecovery"
|
|
|
+ :rules="{
|
|
|
+ required: weighedRequired == 0 ? true : false,
|
|
|
+ message: ' ',
|
|
|
+ trigger: ['blur', 'change'],
|
|
|
+ }">
|
|
|
<el-select
|
|
|
v-model="form.fIfweightRecovery"
|
|
|
placeholder="是否复磅"
|
|
|
clearable
|
|
|
- :disabled="browseStatus || form.warehouseStatus > 3"
|
|
|
style="width: 80%"
|
|
|
>
|
|
|
<el-option
|
|
@@ -1033,12 +1023,16 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="复磅时间" prop="weightRecoveryDate">
|
|
|
+ <el-form-item label="复磅时间" prop="weightRecoveryDate"
|
|
|
+ :rules="{
|
|
|
+ required: weighedRequired == 0 ? true : false,
|
|
|
+ message: ' ',
|
|
|
+ trigger: ['blur', 'change'],
|
|
|
+ }">
|
|
|
<el-date-picker
|
|
|
v-model="form.weightRecoveryDate"
|
|
|
style="width: 80%"
|
|
|
type="date"
|
|
|
- :disabled="browseStatus || form.warehouseStatus > 3"
|
|
|
value-format="timestamp"
|
|
|
placeholder="请选择复磅时间"
|
|
|
>
|
|
@@ -1160,7 +1154,6 @@
|
|
|
>录 入
|
|
|
</el-button>
|
|
|
<el-button
|
|
|
- :disabled="browseStatus"
|
|
|
type="primary"
|
|
|
size="small"
|
|
|
@click="saveForm"
|
|
@@ -1199,9 +1192,7 @@
|
|
|
v-if="entryPrinting == 0"
|
|
|
@click="discharge"
|
|
|
>叫车进场
|
|
|
- </el-button
|
|
|
- >
|
|
|
-
|
|
|
+ </el-button>
|
|
|
<!-- :disabled="dataListSelection.length <= 0 || browseStatus || entryPrinting == 1"-->
|
|
|
<el-button
|
|
|
size="small"
|
|
@@ -5780,7 +5771,7 @@
|
|
|
@click="print_zyd = true"
|
|
|
>作业单
|
|
|
</el-button>
|
|
|
- <el-button :disabled="browseStatus" type="primary" @click="saveForm()"
|
|
|
+ <el-button type="primary" @click="saveForm()"
|
|
|
>保 存
|
|
|
</el-button
|
|
|
>
|
|
@@ -5789,8 +5780,7 @@
|
|
|
style="background-color: #008000; color: #fff"
|
|
|
@click="submitForm()"
|
|
|
>请核
|
|
|
- </el-button
|
|
|
- >
|
|
|
+ </el-button>
|
|
|
<el-button type="danger" v-if="form.fBillstatus === 6" @click="revoke"
|
|
|
>撤销请核
|
|
|
</el-button
|
|
@@ -6253,6 +6243,7 @@ export default {
|
|
|
showfPartNumber: null,
|
|
|
newPlan: 1,
|
|
|
entryPrinting: 1,
|
|
|
+ weighedRequired: 1,
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
@@ -6302,6 +6293,9 @@ export default {
|
|
|
this.getConfigKey("entry.printing").then((response) => {
|
|
|
this.entryPrinting = response.msg;
|
|
|
});
|
|
|
+ this.getConfigKey("weighed.Required").then((response) => {
|
|
|
+ this.weighedRequired = response.msg;
|
|
|
+ });
|
|
|
this.getConfigKey("new.plan").then((response) => {
|
|
|
this.newPlan = response.msg;
|
|
|
});
|
|
@@ -7436,7 +7430,6 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
saveForm(status) {
|
|
|
- console.log(this.form.fPlannetweight)
|
|
|
let checkData = {
|
|
|
fId: this.form.fId,
|
|
|
fType: "warehouse",
|