bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

前端试运行问题修改

This commit is contained in:
zhouzy062 2024-03-19 11:12:02 +08:00
parent 34d55b59e0
commit cfc7cded3a
29 changed files with 239 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sgzb-ui/src/views/base/assetAttributeManagement/index.vue
View File

@ -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 ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="资产类型名称" prop="propName"> <el-form-item label="资产类型名称" prop="propName">
<el-input v-model="form.propName" placeholder="请输入资产类型名称" maxlength="60"/> <el-input v-model="form.propName" placeholder="请输入资产类型名称" maxlength="60"/>

2
sgzb-ui/src/views/base/comeAndGo/index.vue
View File

@ -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 ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="单位名称" prop="unitName"> <el-form-item label="单位名称" prop="unitName">
<el-input <el-input

2
sgzb-ui/src/views/base/project/index.vue
View File

@ -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 ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="工程项目名称" prop="proName"> <el-form-item label="工程项目名称" prop="proName">
<el-input v-model="form.proName" placeholder="请输入单位类型名称" maxlength="50"/> <el-input v-model="form.proName" placeholder="请输入单位类型名称" maxlength="50"/>

2
sgzb-ui/src/views/base/section/index.vue
View File

@ -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 ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="标段工程名称" prop="lotName"> <el-form-item label="标段工程名称" prop="lotName">
<el-input v-model="form.lotName" placeholder="请输入标段工程名称" maxlength="50"/> <el-input v-model="form.lotName" placeholder="请输入标段工程名称" maxlength="50"/>

2
sgzb-ui/src/views/base/unit/index.vue
View File

@ -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 ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="单位类型名称" prop="name"> <el-form-item label="单位类型名称" prop="name">
<el-input v-model="form.name" placeholder="请输入单位类型名称" maxlength="50"/> <el-input v-model="form.name" placeholder="请输入单位类型名称" maxlength="50"/>

2
sgzb-ui/src/views/claimAndRefund/constructionSite/constructionSite.vue
View File

@ -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-form :model="dialogParams" ref="dialogForm" :rules="rules" size="small" :inline="true" label-width="100px">
<el-row> <el-row>
<el-form-item label="退料单位" prop="backUnitId"> <el-form-item label="退料单位" prop="backUnitId">

211
sgzb-ui/src/views/claimAndRefund/receive/agreement.vue
View File

@ -132,91 +132,138 @@
/> />
<!-- 新增编辑弹窗 --> <!-- 新增编辑弹窗 -->
<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-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="合同编号" prop="contractCode"> <el-row>
<el-input <el-col :span="12">
maxlength="50" v-model="form.contractCode" placeholder="合同编号" /> <el-form-item label="合同编号" prop="contractCode">
</el-form-item> <el-input maxlength="50" v-model="form.contractCode" placeholder="合同编号" />
<el-form-item label="往来单位:" prop="unitId"> </el-form-item>
<el-select v-model="form.unitId" filterable placeholder="请选择往来单位" style="width: 100%;" > </el-col>
<el-option <el-col :span="12">
v-for="item in unitList" <el-form-item label="往来单位:" prop="unitId">
:key="item.unitId" <el-select v-model="form.unitId" filterable placeholder="请选择往来单位" >
:label="item.unitName" <el-option
:value="item.unitId" v-for="item in unitList"
></el-option> :key="item.unitId"
</el-select> :label="item.unitName"
</el-form-item> :value="item.unitId"
<el-form-item label="工程名称" prop="projectId"> ></el-option>
<el-select v-model="form.projectId" filterable placeholder="请选择工程名称" style="width: 100%;" > </el-select>
<el-option </el-form-item>
v-for="item in projectList" </el-col>
:key="item.projectId" </el-row>
:label="item.projectName"
:value="item.projectId" <el-row>
></el-option> <el-col :span="12">
</el-select> <el-form-item label="工程名称" prop="projectId">
</el-form-item> <el-select v-model="form.projectId" filterable placeholder="请选择工程名称" >
<el-form-item label="协议类型" prop="protocol"> <el-option
<el-select v-model="form.protocol" filterable placeholder="请选择协议类型" style="width: 100%;" > v-for="item in projectList"
<el-option :key="item.projectId"
v-for="item in protocolList" :label="item.projectName"
:key="item.protocolId" :value="item.projectId"
:label="item.protocolName" ></el-option>
:value="item.protocolId" </el-select>
></el-option> </el-form-item>
</el-select> </el-col>
</el-form-item> <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-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%;"
v-model="form.planStartTime"
value-format="yyyy-MM-dd"
type="date"
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" 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"
style="width:100%;"
value-format="yyyy-MM-dd"
type="date"
placeholder="开始日期"
></el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="开始日期" prop="planStartTime"> <el-row>
<el-date-picker <el-col :span="12">
style="width:100%;" <el-form-item label="授权人" prop="authPerson">
v-model="form.planStartTime" <el-input
value-format="yyyy-MM-dd" maxlength="50" v-model="form.authPerson" placeholder="请输入授权人" />
type="date" </el-form-item>
placeholder="开始日期" </el-col>
></el-date-picker> <el-col :span="12">
</el-form-item> <el-form-item label="联系方式" prop="phone">
<el-form-item label="租赁期限(天)" prop="leaseDay"> <el-input v-model="form.phone" placeholder="请输入联系方式" />
<el-input-number v-model="form.leaseDay" style="width:100%;" placeholder="请输入租赁期限(天)" controls-position="right" :min="0" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="签订日期" prop="signTime"> </el-row>
<el-date-picker
v-model="form.signTime" <el-row>
style="width:100%;" <el-col :span="12">
value-format="yyyy-MM-dd" <el-form-item label="合同照片" prop="fileName">
type="date" <el-upload
placeholder="开始日期" :http-request="(obj) => imgUpLoad(obj,'fileUrl')"
></el-date-picker> action="#" :limit='1'
</el-form-item> :file-list="fileList"
<el-form-item label="授权人" prop="authPerson"> :show-file-list="true"
<el-input list-type="picture-card"
maxlength="50" v-model="form.authPerson" placeholder="请输入授权人" /> accept=".png,.jpg,.jpeg"
</el-form-item> :on-success="handleAvatarSuccess"
:on-preview="handlePictureCardPreview"
<el-form-item label="联系方式" prop="phone"> :on-remove="handleRemove">
<el-input v-model="form.phone" placeholder="请输入联系方式" /> <i class="el-icon-plus avatar-uploader-icon"></i>
</el-form-item> </el-upload>
<el-form-item label="合同照片" prop="fileName"> </el-form-item>
<el-upload </el-col>
:http-request="(obj) => imgUpLoad(obj,'fileUrl')" <el-col :span="12">
action="#" :limit='1' <el-form-item label="备注" prop="remark">
:file-list="fileList" <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" maxlength="200"/>
:show-file-list="true" </el-form-item>
list-type="picture-card" </el-col>
accept=".png,.jpg,.jpeg" </el-row>
:on-success="handleAvatarSuccess"
:on-preview="handlePictureCardPreview"
:on-remove="handleRemove">
<i class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer" style="text-align: center"> <div slot="footer" class="dialog-footer" style="text-align: center">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>

4
sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue
View File

@ -122,7 +122,7 @@
</div> </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> <el-input placeholder="请输入审核意见" type="textarea" maxlength="200" :autosize="{ minRows: 4, maxRows: 6}" v-model="queryParams.companyAuditRemarks"></el-input>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="examineVisible=false">取 消</el-button> <el-button @click="examineVisible=false">取 消</el-button>
@ -135,7 +135,7 @@
</div> </div>
</el-dialog> </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> <el-input placeholder="请输入审核意见" type="textarea" maxlength="200" :autosize="{ minRows: 4, maxRows: 6}" v-model="queryParams.companyAuditRemarks"></el-input>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="refuseVisible=false">取 消</el-button> <el-button @click="refuseVisible=false">取 消</el-button>

4
sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue
View File

@ -122,7 +122,7 @@
</div> </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> <el-input placeholder="请输入审核意见" type="textarea" maxlength="200" :autosize="{ minRows: 4, maxRows: 6}" v-model="queryParams.companyAuditRemarks"></el-input>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="examineVisible=false">取 消</el-button> <el-button @click="examineVisible=false">取 消</el-button>
@ -132,7 +132,7 @@
</div> </div>
</el-dialog> </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> <el-input placeholder="请输入审核意见" type="textarea" maxlength="200" :autosize="{ minRows: 4, maxRows: 6}" v-model="queryParams.companyAuditRemarks"></el-input>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="refuseVisible=false">取 消</el-button> <el-button @click="refuseVisible=false">取 消</el-button>

2
sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
View File

@ -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-form :model="dialogQueryParams" ref="queryForm1" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-row> <el-row>
<el-form-item label="退料单位" prop="unitName"> <el-form-item label="退料单位" prop="unitName">

16
sgzb-ui/src/views/claimAndRefund/return/returnFinshed.vue
View File

@ -10,7 +10,7 @@
> >
<el-form-item label="关键字" > <el-form-item label="关键字" >
<el-input <el-input
v-model="queryParams.keyWord"
placeholder="请输入关键字" placeholder="请输入关键字"
clearable clearable
style="width: 240px" style="width: 240px"
@ -19,6 +19,7 @@
</el-form-item> </el-form-item>
<el-form-item label="单位名称" > <el-form-item label="单位名称" >
<el-input <el-input
v-model="queryParams.unitName"
placeholder="请输入单位名称" placeholder="请输入单位名称"
clearable clearable
style="width: 240px" style="width: 240px"
@ -27,6 +28,7 @@
</el-form-item> </el-form-item>
<el-form-item label="工程名称" > <el-form-item label="工程名称" >
<el-input <el-input
v-model="queryParams.proName"
placeholder="请输入工程名称" placeholder="请输入工程名称"
clearable clearable
style="width: 240px" style="width: 240px"
@ -35,6 +37,7 @@
</el-form-item> </el-form-item>
<el-form-item label="工机具类型" > <el-form-item label="工机具类型" >
<el-input <el-input
v-model="queryParams.maType"
placeholder="请输入工机具类型" placeholder="请输入工机具类型"
clearable clearable
style="width: 240px" style="width: 240px"
@ -43,6 +46,7 @@
</el-form-item> </el-form-item>
<el-form-item label="协议号" > <el-form-item label="协议号" >
<el-input <el-input
v-model="queryParams.agreementId"
placeholder="请选择协议号" placeholder="请选择协议号"
clearable clearable
style="width: 240px" style="width: 240px"
@ -51,6 +55,7 @@
</el-form-item> </el-form-item>
<el-form-item label="完成情况" > <el-form-item label="完成情况" >
<el-input <el-input
v-model="queryParams.status"
placeholder="请选择完成情况" placeholder="请选择完成情况"
clearable clearable
style="width: 240px" style="width: 240px"
@ -60,6 +65,7 @@
<el-form-item label="退料申请时间" > <el-form-item label="退料申请时间" >
<el-input <el-input
v-model="queryParams.sTime"
placeholder="请输入退料申请时间" placeholder="请输入退料申请时间"
clearable clearable
style="width: 240px" style="width: 240px"
@ -540,10 +546,10 @@ export default {
}, },
// 完成退料 // 完成退料
handleFinish() { handleFinish() {
this.title = "确认操作"; // this.title = "确认操作";
this.openTextOne = "确认完成退料么?"; // this.openTextOne = "确认完成退料么?";
this.openTextTwo = "确认完成退料么?"; // this.openTextTwo = "确认完成退料么?";
this.openOne = true // this.openOne = true
}, },
submitOpenOneForm() { submitOpenOneForm() {
this.openTextThree = "完成退料成功！"; this.openTextThree = "完成退料成功！";

4
sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue
View File

@ -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 ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="类型名称:" prop="typeName"> <el-form-item label="类型名称:" prop="typeName">
<el-input v-model="form.typeName" placeholder="请输入类型名称" disabled/> <el-input v-model="form.typeName" placeholder="请输入类型名称" disabled/>
@ -151,7 +151,7 @@
</el-dialog> </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 ref="nform" :model="nform" :rules="nrules" label-width="120px">
<el-form-item label="类型名称:" prop="typeName"> <el-form-item label="类型名称:" prop="typeName">
<el-input v-model="nform.typeName" placeholder="请输入类型名称" disabled/> <el-input v-model="nform.typeName" placeholder="请输入类型名称" disabled/>

6
sgzb-ui/src/views/store/label/labelBinding.vue
View File

@ -267,7 +267,7 @@
</div> </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 ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="标签类型" prop="labelType"> <el-form-item label="标签类型" prop="labelType">
<el-select <el-select
@ -331,7 +331,7 @@
:title="title" :title="title"
:visible.sync="createOpen" :visible.sync="createOpen"
width="500px" 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 ref="cform" :model="cform" :rules="crules" label-width="80px">
<el-form-item label="标签类型" prop="labelType"> <el-form-item label="标签类型" prop="labelType">
@ -372,7 +372,7 @@
:title="title" :title="title"
:visible.sync="uploadOpen" :visible.sync="uploadOpen"
width="450px" width="450px"
append-to-body append-to-body :close-on-click-modal="false"
> >
<div style="text-align: center" ref="codeBox"> <div style="text-align: center" ref="codeBox">
<div class="uploadImg"> <div class="uploadImg">

4
sgzb-ui/src/views/store/label/labelBindingHistory.vue
View File

@ -221,7 +221,7 @@
:title="title" :title="title"
:visible.sync="uploadOpen" :visible.sync="uploadOpen"
width="500px" width="500px"
append-to-body append-to-body :close-on-click-modal="false"
> >
<div style="text-align: center"> <div style="text-align: center">
<div class="uploadImg"> <div class="uploadImg">
@ -232,7 +232,7 @@
</el-dialog> </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 ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="字典名称" prop="labelType"> <el-form-item label="字典名称" prop="labelType">
<el-input v-model="form.labelType" placeholder="请输入字典名称" /> <el-input v-model="form.labelType" placeholder="请输入字典名称" />

2
sgzb-ui/src/views/store/label/labelType.vue
View File

@ -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 ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="标签种类名称" prop="dictName"> <el-form-item label="标签种类名称" prop="dictName">
<el-input v-model="form.dictName" placeholder="请输入标签种类名称" /> <el-input v-model="form.dictName" placeholder="请输入标签种类名称" />

34
sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue
View File

@ -9,9 +9,7 @@
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
type="date" type="date"
:disabled="isCheck||isView" :disabled="isCheck||isView"
range-separator="-" placeholder="请选择采购日期"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="到货日期" prop="arrivalTime"> <el-form-item label="到货日期" prop="arrivalTime">
@ -21,9 +19,8 @@
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
type="date" type="date"
:disabled="isCheck||isView" :disabled="isCheck||isView"
range-separator="-" :picker-options="pickerOptions"
start-placeholder="开始日期" placeholder="请选择到货日期"
end-placeholder="结束日期"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="采购员" prop="purchaser"> <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 ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="配件名称:" prop="machineTypeName"> <el-form-item label="配件名称:" prop="machineTypeName">
<el-input v-model="form.machineTypeName" disabled maxlength="50" /> <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() { created() {
const taskId = this.$route.query && this.$route.query.taskId; const taskId = this.$route.query && this.$route.query.taskId;
this.taskId = taskId; this.taskId = taskId;

27
sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryList.vue
View File

@ -113,32 +113,7 @@
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@pagination="getList" @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> <el-dialog :title="title" :visible.sync="openPrint" width="1100px" append-to-body>
<div style="height: 400px;overflow-y: scroll;"> <div style="height: 400px;overflow-y: scroll;">

2
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
View File

@ -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 ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="机具类型名称:" prop="machineTypeName"> <el-form-item label="机具类型名称:" prop="machineTypeName">
<el-input v-model="form.machineTypeName" placeholder="" disabled/> <el-input v-model="form.machineTypeName" placeholder="" disabled/>

52
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
View File

@ -58,9 +58,7 @@
style="width: 240px" style="width: 240px"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
type="date" type="date"
range-separator="-" placeholder="请选择采购日期"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="到货日期" prop="arrivalTime"> <el-form-item label="到货日期" prop="arrivalTime">
@ -68,10 +66,9 @@
v-model="maForm.arrivalTime" v-model="maForm.arrivalTime"
style="width: 240px" style="width: 240px"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
:picker-options="pickerOptions"
type="date" type="date"
range-separator="-" placeholder="请选择到货日期"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="采购员" prop="purchaser"> <el-form-item label="采购员" prop="purchaser">
@ -310,9 +307,32 @@ export default {
// purchaser: [ // purchaser: [
// { required: true, message: "采购员不能为空", trigger: "blur" } // { 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() { created() {
const taskId = this.$route.query && this.$route.query.taskId; const taskId = this.$route.query && this.$route.query.taskId;
this.taskId = taskId; this.taskId = taskId;
@ -384,6 +404,7 @@ export default {
break; break;
} }
} }
this.$set(row, 'createTime', null);
this.$set(row, 'productionTime', ''); this.$set(row, 'productionTime', '');
this.$set(row, 'supplierId', ''); this.$set(row, 'supplierId', '');
this.$set(row, 'purchasePrice', 0); this.$set(row, 'purchasePrice', 0);
@ -543,11 +564,14 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
console.log(row.id) console.log(row.id)
this.equipmentList.forEach((item,index)=>{ this.$modal.confirm('是否确认删除该数据项？').then(() => {
if(item.id == row.id){ this.equipmentList.forEach((item,index)=>{
this.equipmentList.splice(index,1) if(item.id == row.id){
} this.equipmentList.splice(index,1)
}) }
})
}).catch(() => {});
// const roleIds = row.roleId || this.ids; // const roleIds = row.roleId || this.ids;
// this.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项？').then(function() { // this.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项？').then(function() {
@ -562,7 +586,9 @@ export default {
// this.download('system/role/export', { // this.download('system/role/export', {
// ...this.queryParams // ...this.queryParams
// }, `role_${new Date().getTime()}.xlsx`) // }, `role_${new Date().getTime()}.xlsx`)
} },
} }
}; };
</script> </script>

2
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
View File

@ -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-row :gutter="24" class="mb8">
<el-form ref="form" :model="form" :rules="rules" label-width="78px"> <el-form ref="form" :model="form" :rules="rules" label-width="78px">
<el-input v-model="form.typeId" disabled v-show="false"/> <el-input v-model="form.typeId" disabled v-show="false"/>

2
sgzb-ui/src/views/store/shelves/shelvesConfig.vue
View File

@ -153,7 +153,7 @@
</el-row> </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-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">

2
sgzb-ui/src/views/store/shelves/shelvesList.vue
View File

@ -75,7 +75,7 @@
</el-table> </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-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">

2
sgzb-ui/src/views/store/tools/devices.vue
View File

@ -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-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">

2
sgzb-ui/src/views/store/tools/toolsSupplier.vue
View File

@ -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 ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="供应商名称" prop="supplier"> <el-form-item label="供应商名称" prop="supplier">
<el-input v-model="form.supplier" placeholder="请输入供应商名称" maxlength="50"/> <el-input v-model="form.supplier" placeholder="请输入供应商名称" maxlength="50"/>

4
sgzb-ui/src/views/store/tools/toolsType.vue
View File

@ -158,7 +158,7 @@
</el-row> </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-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="12"> <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-form ref="cform" :model="cform" :rules="crules" label-width="110px">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">

2
sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue
View File

@ -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 :model="query" ref="query" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="关键字" prop="keyWord"> <el-form-item label="关键字" prop="keyWord">
<el-input <el-input

2
sgzb-ui/src/views/system/notice/index.vue
View File

@ -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-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">

4
sgzb-ui/src/views/system/role/index.vue
View File

@ -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 ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="角色名称" prop="roleName"> <el-form-item label="角色名称" prop="roleName">
<el-input v-model="form.roleName" placeholder="请输入角色名称" /> <el-input v-model="form.roleName" placeholder="请输入角色名称" />
@ -208,7 +208,7 @@
</el-dialog> </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 :model="form" label-width="80px">
<el-form-item label="角色名称"> <el-form-item label="角色名称">
<el-input v-model="form.roleName" :disabled="true" /> <el-input v-model="form.roleName" :disabled="true" />

2
sgzb-ui/src/views/system/user/index.vue
View File

@ -203,7 +203,7 @@
</el-row> </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-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">