前端试运行问题修改
This commit is contained in:
parent
34d55b59e0
commit
cfc7cded3a
|
|
@ -93,7 +93,7 @@
|
|||
/>
|
||||
|
||||
<!-- 添加或修改参数配置对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
|
||||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
||||
<el-form-item label="资产类型名称" prop="propName">
|
||||
<el-input v-model="form.propName" placeholder="请输入资产类型名称" maxlength="60"/>
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@
|
|||
/>
|
||||
|
||||
<!-- 添加或修改参数配置对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
|
||||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
||||
<el-form-item label="单位名称" prop="unitName">
|
||||
<el-input
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@
|
|||
/>
|
||||
|
||||
<!-- 添加或修改参数配置对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
|
||||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
||||
<el-form-item label="工程项目名称" prop="proName">
|
||||
<el-input v-model="form.proName" placeholder="请输入单位类型名称" maxlength="50"/>
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@
|
|||
/>
|
||||
|
||||
<!-- 添加或修改参数配置对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
|
||||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
||||
<el-form-item label="标段工程名称" prop="lotName">
|
||||
<el-input v-model="form.lotName" placeholder="请输入标段工程名称" maxlength="50"/>
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@
|
|||
/>
|
||||
|
||||
<!-- 添加或修改参数配置对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
|
||||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
||||
<el-form-item label="单位类型名称" prop="name">
|
||||
<el-input v-model="form.name" placeholder="请输入单位类型名称" maxlength="50"/>
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@
|
|||
/>
|
||||
|
||||
<!-- 添加或修改参数配置对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
|
||||
<el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body :close-on-click-modal="false">
|
||||
<el-form :model="dialogParams" ref="dialogForm" :rules="rules" size="small" :inline="true" label-width="100px">
|
||||
<el-row>
|
||||
<el-form-item label="退料单位" prop="backUnitId">
|
||||
|
|
|
|||
|
|
@ -132,14 +132,17 @@
|
|||
/>
|
||||
|
||||
<!-- 新增编辑弹窗 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
|
||||
<el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body :close-on-click-modal="false">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="合同编号" prop="contractCode">
|
||||
<el-input
|
||||
maxlength="50" v-model="form.contractCode" placeholder="合同编号" />
|
||||
<el-input maxlength="50" v-model="form.contractCode" placeholder="合同编号" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="往来单位:" prop="unitId">
|
||||
<el-select v-model="form.unitId" filterable placeholder="请选择往来单位" style="width: 100%;" >
|
||||
<el-select v-model="form.unitId" filterable placeholder="请选择往来单位" >
|
||||
<el-option
|
||||
v-for="item in unitList"
|
||||
:key="item.unitId"
|
||||
|
|
@ -148,8 +151,13 @@
|
|||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="工程名称" prop="projectId">
|
||||
<el-select v-model="form.projectId" filterable placeholder="请选择工程名称" style="width: 100%;" >
|
||||
<el-select v-model="form.projectId" filterable placeholder="请选择工程名称" >
|
||||
<el-option
|
||||
v-for="item in projectList"
|
||||
:key="item.projectId"
|
||||
|
|
@ -158,8 +166,10 @@
|
|||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="协议类型" prop="protocol">
|
||||
<el-select v-model="form.protocol" filterable placeholder="请选择协议类型" style="width: 100%;" >
|
||||
<el-select v-model="form.protocol" filterable placeholder="请选择协议类型" >
|
||||
<el-option
|
||||
v-for="item in protocolList"
|
||||
:key="item.protocolId"
|
||||
|
|
@ -168,7 +178,23 @@
|
|||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="协议类型" prop="protocol">
|
||||
<el-select v-model="form.protocol" filterable placeholder="请选择协议类型" >
|
||||
<el-option
|
||||
v-for="item in protocolList"
|
||||
:key="item.protocolId"
|
||||
:label="item.protocolName"
|
||||
:value="item.protocolId"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="开始日期" prop="planStartTime">
|
||||
<el-date-picker
|
||||
style="width:100%;"
|
||||
|
|
@ -178,9 +204,16 @@
|
|||
placeholder="开始日期"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="租赁期限(天)" prop="leaseDay">
|
||||
<el-input-number v-model="form.leaseDay" style="width:100%;" placeholder="请输入租赁期限(天)" controls-position="right" :min="0" />
|
||||
<el-input-number v-model="form.leaseDay" placeholder="请输入租赁期限(天)" controls-position="right" :min="0" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="签订日期" prop="signTime">
|
||||
<el-date-picker
|
||||
v-model="form.signTime"
|
||||
|
|
@ -190,15 +223,25 @@
|
|||
placeholder="开始日期"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="授权人" prop="authPerson">
|
||||
<el-input
|
||||
maxlength="50" v-model="form.authPerson" placeholder="请输入授权人" />
|
||||
</el-form-item>
|
||||
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="联系方式" prop="phone">
|
||||
<el-input v-model="form.phone" placeholder="请输入联系方式" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="合同照片" prop="fileName">
|
||||
<el-upload
|
||||
:http-request="(obj) => imgUpLoad(obj,'fileUrl')"
|
||||
|
|
@ -214,9 +257,13 @@
|
|||
</el-upload>
|
||||
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
|
||||
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注" maxlength="200"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer" style="text-align: center">
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@
|
|||
</div>
|
||||
|
||||
<!-- 同意 -->
|
||||
<el-dialog title="审核意见" :visible.sync="examineVisible" width="600px">
|
||||
<el-dialog title="审核意见" :visible.sync="examineVisible" width="600px" :close-on-click-modal="false">
|
||||
<el-input placeholder="请输入审核意见" type="textarea" maxlength="200" :autosize="{ minRows: 4, maxRows: 6}" v-model="queryParams.companyAuditRemarks"></el-input>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button @click="examineVisible=false">取 消</el-button>
|
||||
|
|
@ -135,7 +135,7 @@
|
|||
</div>
|
||||
</el-dialog>
|
||||
<!-- 驳回 -->
|
||||
<el-dialog title="审核意见" :visible.sync="refuseVisible" width="600px">
|
||||
<el-dialog title="审核意见" :visible.sync="refuseVisible" width="600px" :close-on-click-modal="false">
|
||||
<el-input placeholder="请输入审核意见" type="textarea" maxlength="200" :autosize="{ minRows: 4, maxRows: 6}" v-model="queryParams.companyAuditRemarks"></el-input>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button @click="refuseVisible=false">取 消</el-button>
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@
|
|||
</div>
|
||||
|
||||
<!-- 同意 -->
|
||||
<el-dialog title="审核意见" :visible.sync="examineVisible" width="600px">
|
||||
<el-dialog title="审核意见" :visible.sync="examineVisible" width="600px" :close-on-click-modal="false">
|
||||
<el-input placeholder="请输入审核意见" type="textarea" maxlength="200" :autosize="{ minRows: 4, maxRows: 6}" v-model="queryParams.companyAuditRemarks"></el-input>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button @click="examineVisible=false">取 消</el-button>
|
||||
|
|
@ -132,7 +132,7 @@
|
|||
</div>
|
||||
</el-dialog>
|
||||
<!-- 驳回 -->
|
||||
<el-dialog title="审核意见" :visible.sync="refuseVisible" width="600px">
|
||||
<el-dialog title="审核意见" :visible.sync="refuseVisible" width="600px" :close-on-click-modal="false">
|
||||
<el-input placeholder="请输入审核意见" type="textarea" maxlength="200" :autosize="{ minRows: 4, maxRows: 6}" v-model="queryParams.companyAuditRemarks"></el-input>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button @click="refuseVisible=false">取 消</el-button>
|
||||
|
|
|
|||
|
|
@ -186,7 +186,7 @@
|
|||
/>
|
||||
|
||||
<!-- 添加或修改参数配置对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
|
||||
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false">
|
||||
<el-form :model="dialogQueryParams" ref="queryForm1" size="small" :inline="true" v-show="showSearch" label-width="100px">
|
||||
<el-row>
|
||||
<el-form-item label="退料单位" prop="unitName">
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
>
|
||||
<el-form-item label="关键字" >
|
||||
<el-input
|
||||
|
||||
v-model="queryParams.keyWord"
|
||||
placeholder="请输入关键字"
|
||||
clearable
|
||||
style="width: 240px"
|
||||
|
|
@ -19,6 +19,7 @@
|
|||
</el-form-item>
|
||||
<el-form-item label="单位名称" >
|
||||
<el-input
|
||||
v-model="queryParams.unitName"
|
||||
placeholder="请输入单位名称"
|
||||
clearable
|
||||
style="width: 240px"
|
||||
|
|
@ -27,6 +28,7 @@
|
|||
</el-form-item>
|
||||
<el-form-item label="工程名称" >
|
||||
<el-input
|
||||
v-model="queryParams.proName"
|
||||
placeholder="请输入工程名称"
|
||||
clearable
|
||||
style="width: 240px"
|
||||
|
|
@ -35,6 +37,7 @@
|
|||
</el-form-item>
|
||||
<el-form-item label="工机具类型" >
|
||||
<el-input
|
||||
v-model="queryParams.maType"
|
||||
placeholder="请输入工机具类型"
|
||||
clearable
|
||||
style="width: 240px"
|
||||
|
|
@ -43,6 +46,7 @@
|
|||
</el-form-item>
|
||||
<el-form-item label="协议号" >
|
||||
<el-input
|
||||
v-model="queryParams.agreementId"
|
||||
placeholder="请选择协议号"
|
||||
clearable
|
||||
style="width: 240px"
|
||||
|
|
@ -51,6 +55,7 @@
|
|||
</el-form-item>
|
||||
<el-form-item label="完成情况" >
|
||||
<el-input
|
||||
v-model="queryParams.status"
|
||||
placeholder="请选择完成情况"
|
||||
clearable
|
||||
style="width: 240px"
|
||||
|
|
@ -60,6 +65,7 @@
|
|||
|
||||
<el-form-item label="退料申请时间" >
|
||||
<el-input
|
||||
v-model="queryParams.sTime"
|
||||
placeholder="请输入退料申请时间"
|
||||
clearable
|
||||
style="width: 240px"
|
||||
|
|
@ -540,10 +546,10 @@ export default {
|
|||
},
|
||||
// 完成退料
|
||||
handleFinish() {
|
||||
this.title = "确认操作";
|
||||
this.openTextOne = "确认完成退料么?";
|
||||
this.openTextTwo = "确认完成退料么?";
|
||||
this.openOne = true
|
||||
// this.title = "确认操作";
|
||||
// this.openTextOne = "确认完成退料么?";
|
||||
// this.openTextTwo = "确认完成退料么?";
|
||||
// this.openOne = true
|
||||
},
|
||||
submitOpenOneForm() {
|
||||
this.openTextThree = "完成退料成功!";
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@
|
|||
/>
|
||||
|
||||
<!-- 出库弹窗 -->
|
||||
<el-dialog :title="title" :visible.sync="openOut" width="600px" append-to-body>
|
||||
<el-dialog :title="title" :visible.sync="openOut" width="600px" append-to-body :close-on-click-modal="false">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
||||
<el-form-item label="类型名称:" prop="typeName">
|
||||
<el-input v-model="form.typeName" placeholder="请输入类型名称" disabled/>
|
||||
|
|
@ -151,7 +151,7 @@
|
|||
</el-dialog>
|
||||
|
||||
<!-- 进库弹窗 -->
|
||||
<el-dialog :title="title" :visible.sync="openIn" width="600px" append-to-body>
|
||||
<el-dialog :title="title" :visible.sync="openIn" width="600px" append-to-body :close-on-click-modal="false">
|
||||
<el-form ref="nform" :model="nform" :rules="nrules" label-width="120px">
|
||||
<el-form-item label="类型名称:" prop="typeName">
|
||||
<el-input v-model="nform.typeName" placeholder="请输入类型名称" disabled/>
|
||||
|
|
|
|||
|
|
@ -267,7 +267,7 @@
|
|||
</div>
|
||||
|
||||
<!-- 标签绑定对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
||||
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-form-item label="标签类型" prop="labelType">
|
||||
<el-select
|
||||
|
|
@ -331,7 +331,7 @@
|
|||
:title="title"
|
||||
:visible.sync="createOpen"
|
||||
width="500px"
|
||||
append-to-body
|
||||
append-to-body :close-on-click-modal="false"
|
||||
>
|
||||
<el-form ref="cform" :model="cform" :rules="crules" label-width="80px">
|
||||
<el-form-item label="标签类型" prop="labelType">
|
||||
|
|
@ -372,7 +372,7 @@
|
|||
:title="title"
|
||||
:visible.sync="uploadOpen"
|
||||
width="450px"
|
||||
append-to-body
|
||||
append-to-body :close-on-click-modal="false"
|
||||
>
|
||||
<div style="text-align: center" ref="codeBox">
|
||||
<div class="uploadImg">
|
||||
|
|
|
|||
|
|
@ -221,7 +221,7 @@
|
|||
:title="title"
|
||||
:visible.sync="uploadOpen"
|
||||
width="500px"
|
||||
append-to-body
|
||||
append-to-body :close-on-click-modal="false"
|
||||
>
|
||||
<div style="text-align: center">
|
||||
<div class="uploadImg">
|
||||
|
|
@ -232,7 +232,7 @@
|
|||
</el-dialog>
|
||||
|
||||
<!-- 添加或修改参数配置对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
||||
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-form-item label="字典名称" prop="labelType">
|
||||
<el-input v-model="form.labelType" placeholder="请输入字典名称" />
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@
|
|||
/>
|
||||
|
||||
<!-- 添加或修改参数配置对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
|
||||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
||||
<el-form-item label="标签种类名称" prop="dictName">
|
||||
<el-input v-model="form.dictName" placeholder="请输入标签种类名称" />
|
||||
|
|
|
|||
|
|
@ -9,9 +9,7 @@
|
|||
value-format="yyyy-MM-dd"
|
||||
type="date"
|
||||
:disabled="isCheck||isView"
|
||||
range-separator="-"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
placeholder="请选择采购日期"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="到货日期" prop="arrivalTime">
|
||||
|
|
@ -21,9 +19,8 @@
|
|||
value-format="yyyy-MM-dd"
|
||||
type="date"
|
||||
:disabled="isCheck||isView"
|
||||
range-separator="-"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
:picker-options="pickerOptions"
|
||||
placeholder="请选择到货日期"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="采购员" prop="purchaser">
|
||||
|
|
@ -176,7 +173,7 @@
|
|||
|
||||
|
||||
<!-- 验收对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
||||
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
||||
<el-form-item label="配件名称:" prop="machineTypeName">
|
||||
<el-input v-model="form.machineTypeName" disabled maxlength="50" />
|
||||
|
|
@ -332,6 +329,29 @@ export default {
|
|||
},
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
pickerOptions() {
|
||||
const that = this;
|
||||
return {
|
||||
disabledDate(time) {
|
||||
if (that.maForm.purchaseTime) {
|
||||
return (
|
||||
time.getTime() < Date.now() ||
|
||||
time.getTime() < new Date(that.maForm.purchaseTime).getTime() - 8.64e7
|
||||
);
|
||||
}
|
||||
return time.getTime() < Date.now(); //实现1效果
|
||||
},
|
||||
};
|
||||
},
|
||||
},
|
||||
watch: {
|
||||
'maForm.purchaseTime'() {
|
||||
if (this.maForm.purchaseTime != '') {
|
||||
this.maForm.arrivalTime = ''
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
const taskId = this.$route.query && this.$route.query.taskId;
|
||||
this.taskId = taskId;
|
||||
|
|
|
|||
|
|
@ -114,31 +114,6 @@
|
|||
@pagination="getList"
|
||||
/>
|
||||
|
||||
<!-- 对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
||||
<el-form-item label="基层单位" prop="dictName">
|
||||
<el-input v-model="form.dictName" placeholder="请输入基层单位" />
|
||||
</el-form-item>
|
||||
<el-form-item label="规格型号" prop="dictName">
|
||||
<el-input v-model="form.dictName" placeholder="请输入基层单位" />
|
||||
</el-form-item>
|
||||
<el-form-item label="计划数" prop="dictName">
|
||||
<el-input v-model="form.dictName" placeholder="请输入基层单位" />
|
||||
</el-form-item>
|
||||
<el-form-item label="计划单价" prop="dictName">
|
||||
<el-input v-model="form.dictName" placeholder="请输入基层单位" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" prop="dictName">
|
||||
<el-input v-model="form.dictName" placeholder="请输入基层单位" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer" style="text-align: center">
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<!-- 验收单弹窗 -->
|
||||
<el-dialog :title="title" :visible.sync="openPrint" width="1100px" append-to-body>
|
||||
<div style="height: 400px;overflow-y: scroll;">
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@
|
|||
|
||||
|
||||
<!-- 验收弹窗 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="650px" append-to-body>
|
||||
<el-dialog :title="title" :visible.sync="open" width="650px" append-to-body :close-on-click-modal="false">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
||||
<el-form-item label="机具类型名称:" prop="machineTypeName">
|
||||
<el-input v-model="form.machineTypeName" placeholder="" disabled/>
|
||||
|
|
|
|||
|
|
@ -58,9 +58,7 @@
|
|||
style="width: 240px"
|
||||
value-format="yyyy-MM-dd"
|
||||
type="date"
|
||||
range-separator="-"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
placeholder="请选择采购日期"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="到货日期" prop="arrivalTime">
|
||||
|
|
@ -68,10 +66,9 @@
|
|||
v-model="maForm.arrivalTime"
|
||||
style="width: 240px"
|
||||
value-format="yyyy-MM-dd"
|
||||
:picker-options="pickerOptions"
|
||||
type="date"
|
||||
range-separator="-"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
placeholder="请选择到货日期"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="采购员" prop="purchaser">
|
||||
|
|
@ -310,9 +307,32 @@ export default {
|
|||
// purchaser: [
|
||||
// { required: true, message: "采购员不能为空", trigger: "blur" }
|
||||
// ]
|
||||
}
|
||||
},
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
pickerOptions() {
|
||||
const that = this;
|
||||
return {
|
||||
disabledDate(time) {
|
||||
if (that.maForm.purchaseTime) {
|
||||
return (
|
||||
time.getTime() < Date.now() ||
|
||||
time.getTime() < new Date(that.maForm.purchaseTime).getTime() - 8.64e7
|
||||
);
|
||||
}
|
||||
return time.getTime() < Date.now(); //实现1效果
|
||||
},
|
||||
};
|
||||
},
|
||||
},
|
||||
watch: {
|
||||
'maForm.purchaseTime'() {
|
||||
if (this.maForm.purchaseTime != '') {
|
||||
this.maForm.arrivalTime = ''
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
const taskId = this.$route.query && this.$route.query.taskId;
|
||||
this.taskId = taskId;
|
||||
|
|
@ -384,6 +404,7 @@ export default {
|
|||
break;
|
||||
}
|
||||
}
|
||||
this.$set(row, 'createTime', null);
|
||||
this.$set(row, 'productionTime', '');
|
||||
this.$set(row, 'supplierId', '');
|
||||
this.$set(row, 'purchasePrice', 0);
|
||||
|
|
@ -543,11 +564,14 @@ export default {
|
|||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
console.log(row.id)
|
||||
this.$modal.confirm('是否确认删除该数据项?').then(() => {
|
||||
this.equipmentList.forEach((item,index)=>{
|
||||
if(item.id == row.id){
|
||||
this.equipmentList.splice(index,1)
|
||||
}
|
||||
})
|
||||
}).catch(() => {});
|
||||
|
||||
|
||||
// const roleIds = row.roleId || this.ids;
|
||||
// this.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项?').then(function() {
|
||||
|
|
@ -562,7 +586,9 @@ export default {
|
|||
// this.download('system/role/export', {
|
||||
// ...this.queryParams
|
||||
// }, `role_${new Date().getTime()}.xlsx`)
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@
|
|||
/> -->
|
||||
|
||||
<!-- 添加或修改参数配置对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
|
||||
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false">
|
||||
<el-row :gutter="24" class="mb8">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="78px">
|
||||
<el-input v-model="form.typeId" disabled v-show="false"/>
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@
|
|||
</el-row>
|
||||
|
||||
<!-- 添加或修改用户配置对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
|
||||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@
|
|||
</el-table>
|
||||
|
||||
<!-- 添加或修改部门对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
|
||||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@
|
|||
/>
|
||||
|
||||
<!-- 添加或修改参数配置对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
|
||||
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@
|
|||
/>
|
||||
|
||||
<!-- 添加或修改参数配置对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
|
||||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
||||
<el-form-item label="供应商名称" prop="supplier">
|
||||
<el-input v-model="form.supplier" placeholder="请输入供应商名称" maxlength="50"/>
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@
|
|||
</el-row>
|
||||
|
||||
<!-- 添加或修改用户配置对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="850px" append-to-body>
|
||||
<el-dialog :title="title" :visible.sync="open" width="850px" append-to-body :close-on-click-modal="false">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
|
|
@ -305,7 +305,7 @@
|
|||
|
||||
|
||||
<!-- 配置弹窗 -->
|
||||
<el-dialog :title="title" :visible.sync="configOpen" width="650px" append-to-body>
|
||||
<el-dialog :title="title" :visible.sync="configOpen" width="650px" append-to-body :close-on-click-modal="false">
|
||||
<el-form ref="cform" :model="cform" :rules="crules" label-width="110px">
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
|
|
|
|||
|
|
@ -161,7 +161,7 @@
|
|||
|
||||
|
||||
<!-- 添加或修改参数配置对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
|
||||
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false">
|
||||
<el-form :model="query" ref="query" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
||||
<el-form-item label="关键字" prop="keyWord">
|
||||
<el-input
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@
|
|||
/>
|
||||
|
||||
<!-- 添加或修改公告对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="780px" append-to-body :close-on-click-modal="false">
|
||||
<el-dialog :title="title" :visible.sync="open" width="750px" append-to-body :close-on-click-modal="false">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@
|
|||
/>
|
||||
|
||||
<!-- 添加或修改角色配置对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
||||
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
|
||||
<el-form-item label="角色名称" prop="roleName">
|
||||
<el-input v-model="form.roleName" placeholder="请输入角色名称" />
|
||||
|
|
@ -208,7 +208,7 @@
|
|||
</el-dialog>
|
||||
|
||||
<!-- 分配角色数据权限对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
|
||||
<el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body :close-on-click-modal="false">
|
||||
<el-form :model="form" label-width="80px">
|
||||
<el-form-item label="角色名称">
|
||||
<el-input v-model="form.roleName" :disabled="true" />
|
||||
|
|
|
|||
|
|
@ -203,7 +203,7 @@
|
|||
</el-row>
|
||||
|
||||
<!-- 添加或修改用户配置对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
|
||||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
|
|
|
|||
Loading…
Reference in New Issue