|
@@ -774,11 +774,20 @@
|
|
label="排产日期"
|
|
label="排产日期"
|
|
prop="jhTime"
|
|
prop="jhTime"
|
|
>
|
|
>
|
|
- <zj-timegran-date
|
|
|
|
|
|
+ <el-date-picker
|
|
|
|
+ v-model="dialog.editorBox.form.data.jhTime"
|
|
|
|
+ type="date"
|
|
|
|
+ style="width: 100%;"
|
|
|
|
+ placeholder="选择日期"
|
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
|
+ :disabled = "dialog.editorBox.form.data.dateEnable">
|
|
|
|
+ </el-date-picker>
|
|
|
|
+ <!-- <zj-timegran-date
|
|
v-model="dialog.editorBox.form.data.jhTime"
|
|
v-model="dialog.editorBox.form.data.jhTime"
|
|
style="width: 100%;"
|
|
style="width: 100%;"
|
|
:timegranId="'DAY'"
|
|
:timegranId="'DAY'"
|
|
- ></zj-timegran-date>
|
|
|
|
|
|
+ disabled = "true"
|
|
|
|
+ ></zj-timegran-date> -->
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="12">
|
|
<el-col :span="12">
|
|
@@ -786,11 +795,20 @@
|
|
label="交货日期"
|
|
label="交货日期"
|
|
prop="deliveryDate"
|
|
prop="deliveryDate"
|
|
>
|
|
>
|
|
- <zj-timegran-date
|
|
|
|
|
|
+ <el-date-picker
|
|
|
|
+ v-model="dialog.editorBox.form.data.deliveryDate"
|
|
|
|
+ type="date"
|
|
|
|
+ style="width: 100%;"
|
|
|
|
+ placeholder="选择日期"
|
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
|
+ :disabled = "dialog.editorBox.form.data.dateEnable">
|
|
|
|
+ </el-date-picker>
|
|
|
|
+ <!-- <zj-timegran-date
|
|
v-model="dialog.editorBox.form.data.deliveryDate"
|
|
v-model="dialog.editorBox.form.data.deliveryDate"
|
|
style="width: 100%;"
|
|
style="width: 100%;"
|
|
:timegranId="'DAY'"
|
|
:timegranId="'DAY'"
|
|
- ></zj-timegran-date>
|
|
|
|
|
|
+ disabled = "true"
|
|
|
|
+ ></zj-timegran-date> -->
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
</el-row>
|
|
</el-row>
|
|
@@ -805,6 +823,7 @@
|
|
v-model="dialog.editorBox.form.data.tag"
|
|
v-model="dialog.editorBox.form.data.tag"
|
|
placeholder=""
|
|
placeholder=""
|
|
style="width: 100%;"
|
|
style="width: 100%;"
|
|
|
|
+ @change="isMileageCardOrder"
|
|
>
|
|
>
|
|
<el-option
|
|
<el-option
|
|
v-for="item of nameObj.tag.arr"
|
|
v-for="item of nameObj.tag.arr"
|
|
@@ -1103,6 +1122,7 @@ export default {
|
|
iateralArea: '',
|
|
iateralArea: '',
|
|
deliveryDate: '',
|
|
deliveryDate: '',
|
|
tag: '0',
|
|
tag: '0',
|
|
|
|
+ dateEnable: false
|
|
},
|
|
},
|
|
rules: {
|
|
rules: {
|
|
planWeight: [
|
|
planWeight: [
|
|
@@ -2063,6 +2083,9 @@ export default {
|
|
that.dialog.editorBox.form.data.lengthTimesWidth = '';
|
|
that.dialog.editorBox.form.data.lengthTimesWidth = '';
|
|
that.dialog.editorBox.form.data.memo = '';
|
|
that.dialog.editorBox.form.data.memo = '';
|
|
that.dialog.editorBox.form.data.tag = '0';
|
|
that.dialog.editorBox.form.data.tag = '0';
|
|
|
|
+ that.dialog.editorBox.form.data.deliveryDate = formatDate(new Date(),'yyyy-MM-dd');
|
|
|
|
+ that.dialog.editorBox.form.data.jhTime = formatDate(new Date(),'yyyy-MM-dd');
|
|
|
|
+ that.dialog.editorBox.form.data.dateEnable = false;
|
|
that.dialog.editorBox.show = true;
|
|
that.dialog.editorBox.show = true;
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
that.$refs['dialog_form'].clearValidate();
|
|
that.$refs['dialog_form'].clearValidate();
|
|
@@ -2574,7 +2597,20 @@ export default {
|
|
}).catch(() => {
|
|
}).catch(() => {
|
|
_this.loading = false
|
|
_this.loading = false
|
|
})
|
|
})
|
|
- }
|
|
|
|
|
|
+ },
|
|
|
|
+ // 订单类型下拉框选择事件
|
|
|
|
+ isMileageCardOrder(val){
|
|
|
|
+ let that = this;
|
|
|
|
+ if (val == '1') {
|
|
|
|
+ that.dialog.editorBox.form.data.deliveryDate = '2020-01-01';
|
|
|
|
+ that.dialog.editorBox.form.data.jhTime = '2020-01-01';
|
|
|
|
+ that.dialog.editorBox.form.data.dateEnable = true;
|
|
|
|
+ } else {
|
|
|
|
+ that.dialog.editorBox.form.data.deliveryDate = formatDate(new Date(),'yyyy-MM-dd');
|
|
|
|
+ that.dialog.editorBox.form.data.jhTime = formatDate(new Date(),'yyyy-MM-dd');
|
|
|
|
+ that.dialog.editorBox.form.data.dateEnable = false;
|
|
|
|
+ }
|
|
|
|
+ },
|
|
}
|
|
}
|
|
}
|
|
}
|
|
function sortNumber (a, b) {
|
|
function sortNumber (a, b) {
|