Commit 53959ce6 authored by zhengke's avatar zhengke

修改

parent 875e3c4b
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
</template> </template>
</q-input> </q-input>
</div> </div>
<div v-if="tabCheck == 'second'"> <div v-if="tabCheck == 'second'&&DutyAuthObj.isShowAddCustom">
<q-btn outline dense icon="add" class="q-px-sm" color="primary" @click="showAddForm = true" label="新增客户"> <q-btn outline dense icon="add" class="q-px-sm" color="primary" @click="showAddForm = true" label="新增客户">
</q-btn> </q-btn>
</div> </div>
...@@ -559,7 +559,8 @@ ...@@ -559,7 +559,8 @@
//权限显示对象 //权限显示对象
DutyAuthObj: { DutyAuthObj: {
isShowAdd: true, //是否显示新增按钮【默认显示】 isShowAdd: true, //是否显示新增按钮【默认显示】
isShowEdit: true //是否显示编辑按钮【默认显示】 isShowEdit: true, //是否显示编辑按钮【默认显示】
isShowAddCustom: true //是否显示新增客户按钮 【默认显示】
}, },
rules: { rules: {
//表单必填验证 //表单必填验证
...@@ -716,9 +717,9 @@ ...@@ -716,9 +717,9 @@
if (this.authObj.isShowEdit != null && !this.authObj.isShowEdit) { if (this.authObj.isShowEdit != null && !this.authObj.isShowEdit) {
this.DutyAuthObj.isShowEdit = this.authObj.isShowEdit; this.DutyAuthObj.isShowEdit = this.authObj.isShowEdit;
} }
if (this.authObj.isShowAddCustom != null && !this.authObj.isShowAddCustom) {
this.DutyAuthObj.isShowAddCustom = this.authObj.isShowAddCustom;
} }
if (!this.DutyAuthObj.isShowEdit) {
this.visibleColumns.splice(this.visibleColumns.length - 1, 1);
} }
}, },
//日语基础枚举 //日语基础枚举
...@@ -751,7 +752,6 @@ ...@@ -751,7 +752,6 @@
this.loading = true; this.loading = true;
getStudentPage(this.msg) getStudentPage(this.msg)
.then(res => { .then(res => {
console.log("res", res);
this.loading = false; this.loading = false;
this.data = res.Data.PageData; this.data = res.Data.PageData;
this.pageCount = res.Data.PageCount; this.pageCount = res.Data.PageCount;
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</div> </div>
<div class="row wrap"> <div class="row wrap">
<q-input filled stack-label maxlength="5" :dense="false" v-model="objOption.No" ref="No" <q-input filled stack-label maxlength="5" :dense="false" v-model="objOption.No" ref="No"
class="col-12 q-pb-lg" label="编号" @keyup.native="checkInteger(objOption,'No')" /> class="col-12 q-pb-lg" label="编号" :rules="[val => !!val || '请填写编号']" @keyup.native="checkInteger(objOption,'No')" />
</div> </div>
</q-card-section> </q-card-section>
<q-separator /> <q-separator />
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
objOption: { objOption: {
Id: 0, Id: 0,
StageName: '', //阶段名称 StageName: '', //阶段名称
No: 1 //编号 No: '' //编号
}, },
optionTitle: "", optionTitle: "",
} }
...@@ -71,7 +71,8 @@ ...@@ -71,7 +71,8 @@
//保存菜单 //保存菜单
saveStage() { saveStage() {
this.$refs.StageName.validate(); this.$refs.StageName.validate();
if (!this.$refs.StageName.hasError) { this.$refs.No.validate();
if (!this.$refs.StageName.hasError&&!this.$refs.No.hasError) {
this.saveLoading = true this.saveLoading = true
SetStage(this.objOption).then(res => { SetStage(this.objOption).then(res => {
this.saveLoading = false; this.saveLoading = false;
......
...@@ -289,6 +289,7 @@ ...@@ -289,6 +289,7 @@
vitiorAuthObj: { vitiorAuthObj: {
isShowAdd: false, //是否显示新增按钮【默认不显示】 isShowAdd: false, //是否显示新增按钮【默认不显示】
isShowEdit: false, //是否显示编辑按钮【默认不显示】 isShowEdit: false, //是否显示编辑按钮【默认不显示】
isShowAddCustom: true //是否显示新增客户按钮 【默认显示】
}, },
//是否显示工作内容相关按钮 //是否显示工作内容相关按钮
workAuthObj: { workAuthObj: {
...@@ -309,6 +310,11 @@ ...@@ -309,6 +310,11 @@
if (this.$route.query.DutyMan){ if (this.$route.query.DutyMan){
this.msg.DutyMan = this.$route.query.DutyMan; this.msg.DutyMan = this.$route.query.DutyMan;
} }
if(this.$route.query.isShowAddCustom){
if(this.$route.query.isShowAddCustom==1){
this.vitiorAuthObj.isShowAddCustom = false;
}
}
this.getList(); this.getList();
}, },
methods: { methods: {
......
...@@ -336,13 +336,11 @@ ...@@ -336,13 +336,11 @@
}, },
//跳转到值班详情 //跳转到值班详情
GoToDutyInfo(item) { GoToDutyInfo(item) {
this.$router.push({ this.OpenNewUrl('/scheduling/scheduleInfo', {
path: "/scheduling/scheduleInfo",
query: {
Id: item.PlanId, Id: item.PlanId,
Shift: item.Shift, Shift: item.Shift,
DutyMan: item.DutyMan DutyMan: item.DutyMan,
} isShowAddCustom: 1
}); });
} }
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment