jufubao-admin-library 1.1.124 → 1.1.126
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/library/viewModules/viewsMaterial/viewsMaterial/dialog/component/company.vue +1 -1
- package/library/viewModules/viewsMaterial/viewsMaterial/dialog/component/my.vue +1 -1
- package/library/viewModules/viewsMaterial/viewsMaterial/dialog/component/share.vue +1 -1
- package/library/viewModules/viewsMaterial/viewsMaterial/dialogMaterial.vue +8 -3
- package/package.json +1 -1
|
@@ -258,7 +258,7 @@ export default {
|
|
|
258
258
|
file_name: this.file_name,
|
|
259
259
|
parent_id: this.parent_id,
|
|
260
260
|
};
|
|
261
|
-
let loading = Loading.service({});
|
|
261
|
+
let loading = Loading.service({zIndex: 4000,background:'rgba(255,255,255,.0)'});
|
|
262
262
|
this.selectMaterialId = '';
|
|
263
263
|
this.getMaterialCompanyList(params)
|
|
264
264
|
.then((res) => {
|
|
@@ -274,7 +274,7 @@ export default {
|
|
|
274
274
|
file_name: this.file_name,
|
|
275
275
|
parent_id: this.parent_id,
|
|
276
276
|
};
|
|
277
|
-
let loading = Loading.service({});
|
|
277
|
+
let loading = Loading.service({zIndex: 4000,background:'rgba(255,255,255,0)'});
|
|
278
278
|
this.selectMaterialId = '';
|
|
279
279
|
this.getMyList(params)
|
|
280
280
|
.then((res) => {
|
|
@@ -203,7 +203,7 @@ export default {
|
|
|
203
203
|
file_name: this.file_name,
|
|
204
204
|
parent_id: this.parent_id,
|
|
205
205
|
};
|
|
206
|
-
let loading = Loading.service({});
|
|
206
|
+
let loading = Loading.service({zIndex: 4000,background:'rgba(255,255,255,0)'});
|
|
207
207
|
this.selectMaterialId = '';
|
|
208
208
|
this.getShareList(params)
|
|
209
209
|
.then((res) => {
|
|
@@ -58,8 +58,8 @@
|
|
|
58
58
|
<!-- 中转站 end -->
|
|
59
59
|
</div>
|
|
60
60
|
<div slot="footer">
|
|
61
|
-
<el-button @click="dialogVisible = false"
|
|
62
|
-
<el-button :disabled="isConfirm" type="primary" @click="handleConfirm">确 定</el-button>
|
|
61
|
+
<el-button :type="isAdmin?'primary':''" @click="dialogVisible = false">{{isAdmin?'关 闭':'取 消'}}</el-button>
|
|
62
|
+
<el-button :disabled="isConfirm" type="primary" @click="handleConfirm" v-if="!isAdmin">确 定</el-button>
|
|
63
63
|
</div>
|
|
64
64
|
</el-dialog>
|
|
65
65
|
</div>
|
|
@@ -89,6 +89,10 @@ export default {
|
|
|
89
89
|
type: Boolean,
|
|
90
90
|
default: false,
|
|
91
91
|
},
|
|
92
|
+
isAdmin:{
|
|
93
|
+
type: Boolean,
|
|
94
|
+
default: false
|
|
95
|
+
}
|
|
92
96
|
},
|
|
93
97
|
watch: {
|
|
94
98
|
show(value) {
|
|
@@ -97,6 +101,7 @@ export default {
|
|
|
97
101
|
}
|
|
98
102
|
this.dialogVisible = value;
|
|
99
103
|
},
|
|
104
|
+
|
|
100
105
|
dialogVisible(value) {
|
|
101
106
|
if(value === false) {
|
|
102
107
|
console.warn('dialogVisible.a'+value);
|
|
@@ -179,7 +184,7 @@ export default {
|
|
|
179
184
|
},
|
|
180
185
|
handleClosed() {
|
|
181
186
|
console.warn('handleClosed' + this.show);
|
|
182
|
-
this.$emit("update:show",
|
|
187
|
+
this.$emit("update:show", false);
|
|
183
188
|
this.$emit("onClose");
|
|
184
189
|
},
|
|
185
190
|
handleConfirm() {
|