dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
cun-nan 2024-07-26 10:33:12 +08:00
parent 8a2a8c4168
commit 39844057bf
10 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fuintAdmin_zt/src/views/Site/index.vue
View File

@ -579,6 +579,7 @@
active-value="A"
inactive-value="N"
@change="handleStatusChangeDuty(scope.row)"
:disabled="scope.row.dutyId==2"
></el-switch>
</template>
</el-table-column>
@ -595,6 +596,7 @@
icon="el-icon-edit"
v-hasPermi="['role:edit']"
@click="handleUpdate1(scope.row)"
:disabled="scope.row.dutyId==2"
>修改</el-button>
<el-button
size="mini"
@ -602,6 +604,7 @@
icon="el-icon-delete"
v-hasPermi="['role:delete']"
@click="handleDelete1(scope.row)"
:disabled="scope.row.dutyId==2"
>删除</el-button>
</template>
</el-table-column>

3
fuintAdmin_zt/src/views/setting/app/index.vue
View File

@ -30,6 +30,7 @@
<el-button
type="primary"
@click="handleAdd"
v-hasPermi="['setting:app:add']"
>新增小程序配置</el-button>
</el-form-item>
</el-form>
@ -65,12 +66,14 @@
type="text"
icon="el-icon-view"
@click="edit(scope.row)"
v-hasPermi="['setting:app:edit']"
>编辑</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="del(scope.row)"
v-hasPermi="['setting:app:delete']"
>删除</el-button>
</template>
</el-table-column>

3
fuintAdmin_zt/src/views/setting/banner/index.vue
View File

@ -44,6 +44,7 @@
type="primary"
icon="el-icon-plus"
@click="handleAdd"
v-hasPermi="['setting:banner:add']"
>新增banner图</el-button>
</el-form-item>
</el-form>
@ -90,12 +91,14 @@
type="text"
icon="el-icon-view"
@click="edit(scope.row)"
v-hasPermi="['setting:banner:edit']"
>编辑</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="del(scope.row)"
v-hasPermi="['setting:banner:delete']"
>删除</el-button>
</template>
</el-table-column>

5
fuintAdmin_zt/src/views/setting/hardware.vue
View File

@ -41,6 +41,7 @@
type="primary"
icon="el-icon-plus"
@click="handleAdd"
v-hasPermi="['setting:hardware:add']"
>新增商品</el-button>
</el-form-item>
</el-form>
@ -75,6 +76,7 @@
type="text"
icon="el-icon-view"
@click="edit(scope.row)"
v-hasPermi="['setting:hardware:edit']"
>编辑</el-button>
<el-button
size="mini"
@ -82,6 +84,7 @@
icon="el-icon-top"
v-if="scope.row.status == 0 "
@click="shangjia(scope.row)"
v-hasPermi="['setting:hardware:grounding']"
>上架</el-button>
<el-button
size="mini"
@ -89,12 +92,14 @@
icon="el-icon-bottom"
v-if="scope.row.status == 1 "
@click="shangjia(scope.row)"
v-hasPermi="['setting:hardware:offShelf']"
>下架</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="del(scope.row)"
v-hasPermi="['setting:hardware:delete']"
>删除</el-button>
</template>
</el-table-column>

3
fuintAdmin_zt/src/views/setting/message.vue
View File

@ -32,6 +32,7 @@
type="primary"
icon="el-icon-plus"
@click="handleAdd"
v-hasPermi="['setting:message:add']"
>新增短信模板</el-button>
</el-form-item>
</el-form>
@ -68,12 +69,14 @@
type="text"
icon="el-icon-view"
@click="edit(scope.row)"
v-hasPermi="['setting:message:edit']"
>编辑</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="del(scope.row)"
v-hasPermi="['setting:message:delete']"
>删除</el-button>
</template>
</el-table-column>

3
fuintAdmin_zt/src/views/setting/pay/index.vue
View File

@ -53,6 +53,7 @@
<el-button
type="primary"
@click="handleAdd"
v-hasPermi="['setting:pay:add']"
>新增支付参数</el-button>
</el-form-item>
</el-form>
@ -108,12 +109,14 @@
type="text"
icon="el-icon-view"
@click="edit(scope.row)"
v-hasPermi="['setting:pay:edit']"
>编辑</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="del(scope.row)"
v-hasPermi="['setting:pay:delete']"
>删除</el-button>
</template>
</el-table-column>

1
fuintAdmin_zt/src/views/system/menu/index.vue
View File

@ -319,6 +319,7 @@ export default {
this.getList();
});
} else {
if(!this.form.merchantId) this.form.merchantId = "0"
addMenu(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;

3
fuintAdmin_zt/src/views/system/notify/page/mode.vue
View File

@ -41,6 +41,7 @@
<el-button
type="primary"
@click="handleAdd"
v-hasPermi="['system:notify:addTemplate']"
>新增通知模板</el-button>
</el-form-item>
</el-form>
@ -69,12 +70,14 @@
type="text"
icon="el-icon-view"
@click="edit(scope.row)"
v-hasPermi="['system:notify:editTemplate']"
>编辑</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="del(scope.row)"
v-hasPermi="['system:notify:deleteTemplate']"
>删除</el-button>
</template>
</el-table-column>

4
fuintAdmin_zt/src/views/system/notify/page/record.vue
View File

@ -41,6 +41,7 @@
<el-button
type="primary"
@click="handleAdd"
v-hasPermi="['system:notify:addRecord']"
>新增通知</el-button>
</el-form-item>
</el-form>
@ -66,18 +67,21 @@
type="text"
icon="el-icon-view"
@click="edit(scope.row)"
v-hasPermi="['system:notify:editRecord']"
>编辑</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="del(scope.row)"
v-hasPermi="['system:notify:deleteRecord']"
>删除</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="send(scope.row.id)"
v-hasPermi="['system:notify:send']"
>发送通知</el-button>
</template>
</el-table-column>

4
fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSourceController.java
View File

@ -120,11 +120,13 @@ public class BackendSourceController extends BaseController {
String icon = param.get("icon").toString();
String path = param.get("path").toString();
String sort = param.get("sort").toString();
String merchantId = param.get("merchantId").toString();
Integer isMenu = param.get("isMenu") == null ? 1 : Integer.parseInt(param.get("isMenu").toString());
TSource addSource = new TSource();
addSource.setSourceName(name);
addSource.setMerchantId(accountInfo.getMerchantId());
// addSource.setMerchantId(accountInfo.getMerchantId());
addSource.setMerchantId(Integer.valueOf(merchantId));
addSource.setStatus(status);
addSource.setNewIcon(icon);
addSource.setIsLog(1);