dianliang/lanan-system-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
nyoung 2024-12-23 12:23:08 +08:00
commit 747a560ca6
8 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/base/cont/form/ContTempForm.vue
View File

@ -88,7 +88,9 @@ export default {
},
methods: {
close(){
this.$router.go(-1);
this.$router.push({
name: "BaseContTemp",
});
},
/** 打开弹窗 */
async open(id) {
@ -106,7 +108,6 @@ export default {
},
/** 提交按钮 */
async submitForm() {
debugger
// 校验主表
await this.$refs["formRef"].validate();
this.formLoading = true;
@ -116,13 +117,17 @@ export default {
if (data.id) {
await ContTempApi.updateContTemp(data);
this.$modal.msgSuccess("修改成功");
this.$router.go(-1);
await this.$router.push({
name: "BaseContTemp",
});
return;
}
// 添加的提交
await ContTempApi.createContTemp(data);
this.$modal.msgSuccess("新增成功");
this.$router.go(-1);
await this.$router.push({
name: "BaseContTemp",
});
} finally {
this.formLoading = false;
}
@ -139,7 +144,6 @@ export default {
status: undefined,
tempContent: undefined,
};
debugger
this.resetForm("formRef");
}
}

2
src/views/base/cont/index.vue
View File

@ -91,7 +91,7 @@
import * as ContTempApi from '@/api/base/cont';
export default {
name: "ContTemp",
name: "BaseContTemp",
components: {
},
data() {

2
src/views/company/property/position/PropertyPosForm.vue
View File

@ -67,8 +67,6 @@ export default {
formRules: {
posName: [{ required: true, message: '存放地名称不能为空', trigger: 'blur' }],
depositType: [{ required: true, message: '存放类型不能为空', trigger: 'blur' }],
area: [{ required: true, message: '面积不能为空', trigger: 'blur' }],
address: [{ required: true, message: '存放地地址不能为空', trigger: 'blur' }],
},
};
},

2
src/views/company/property/position/index.vue
View File

@ -36,7 +36,7 @@
}}</span>
</template>
</el-table-column>
<el-table-column label="所属企业" align="center" prop="corpName" />
<!-- <el-table-column label="所属企业" align="center" prop="corpName" />-->
<el-table-column label="存放地名称" align="center" prop="posName" />
<el-table-column label="存放地地址" align="center" prop="address" />
<el-table-column label="面积(㎡)" align="center" prop="area" />

2
src/views/inspection/inspectionGoods/index.vue
View File

@ -432,7 +432,7 @@
listInspectionGoods(this.queryParams).then(response => {
this.inspectionGoodsList = response.data.records;
this.inspectionGoodsList.price=this.inspectionGoodsList.price / 100
this.total = response.total;
this.total = response.data.total;
this.loading = false;
});
listMallPartners(this.hzsarr).then(response => {

18
src/views/partner/shopadministration/shopadministration.vue
View File

@ -206,7 +206,13 @@
<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="price">
<el-select v-model="form.goodsCategoryId" placeholder="请选择">
<el-select
v-model="form.goodsCategoryId"
clearable
filterable
placeholder="请选择"
:loading="typeLoading"
loading-text="请稍等...">
<el-option
v-for="item in categoryList"
:key="item.id"
@ -334,7 +340,6 @@
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
id: null,
@ -404,7 +409,8 @@
isSpecial: [
{ required: true, message: "特价/正常不能为空", trigger: "change" }
],
}
},
typeLoading: false
};
},
created() {
@ -452,13 +458,14 @@
console.log('resp',response)
this.inspectionGoodsList = response.data.records;
this.inspectionGoodsList.price=this.inspectionGoodsList.price / 100
this.total = response.total;
this.total = response.data.total;
this.loading = false;
});
this.typeLoading = true
categoryList().then(res=>{
this.categoryList = res.data;
this.typeLoading = false
})
// listMallPartners(this.hzsarr).then(response => {
// this.mallPartnersList = response.rows;
// console.log('查询合作商管理列表 ',this.mallPartnersList)
@ -532,6 +539,7 @@
},
/** 重置按钮操作 */
resetQuery() {
this.queryParams.isListing = null
this.resetForm("queryForm");
this.handleQuery();
},

6
src/views/partner/workOrder.vue
View File

@ -314,7 +314,7 @@
<el-form-item label="联系方式">
<el-input type="text" v-model="form.buyPhone"></el-input>
</el-form-item>
<el-form-item label="号牌号码">
<el-form-item label="车牌号码">
<el-input type="text" v-model="form.carNum"></el-input>
</el-form-item>
<el-form-item label="品牌型号">
@ -350,6 +350,9 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="代办人手机号">
<el-input v-model="form.otherPhone" placeholder="请选择代办人手机号"/>
</el-form-item>
<el-form-item label="选择商品">
<el-cascader
@ -794,6 +797,7 @@ export default {
createBy: null,
updateTime: null,
updateBy: null,
otherPhone: null,
};
this.selectInspectionProject = []
this.resetForm("form");

12
src/views/repair/tickets/Components/TicketItem.vue
View File

@ -75,12 +75,12 @@
<span class="item__txt">{{ scope.row.sale ? scope.row.sale.name : scope.row.sale }}</span>
</div>
</el-table-column>
<!-- <el-table-column v-if="!exportColumn.includes('type')" align="center" label="类型" width="180" prop="type">-->
<!-- <div v-if="scope.row.id" class="item" slot-scope="scope">-->
<!-- <ServerChoose @input-blur="save(scope.row)" class="item__input" v-model="scope.row.type"/>-->
<!-- <span class="item__txt">{{ scope.row.type }}</span>-->
<!-- </div>-->
<!-- </el-table-column>-->
<el-table-column v-if="!exportColumn.includes('type')" align="center" label="类型" width="180" prop="type">
<div v-if="scope.row.id" class="item" slot-scope="scope">
<ServerChoose @input-blur="save(scope.row)" class="item__input" v-model="scope.row.type"/>
<span class="item__txt">{{ scope.row.type }}</span>
</div>
</el-table-column>
<!-- <el-table-column v-if="!exportColumn.includes('accountType')" align="center" label="账类" width="180" prop="accountType">-->
<!-- <div v-if="scope.row.id" class="item" slot-scope="scope">-->
<!-- <el-select v-model="scope.row.accountType" class="item__input" @blur="save(scope.row)">-->