czg_team
/
management
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq

This commit is contained in:
gyq 2024-07-23 17:12:16 +08:00
parent dcb2eb36ea 04d23793d1
commit aa7a672e87
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/views/invoicing/components/addConsTakin.vue
View File

@ -21,7 +21,7 @@
<el-input v-model="form.remark" placeholder="请输入备注" style="width: 180px;"></el-input> <el-input v-model="form.remark" placeholder="请输入备注" style="width: 180px;"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="dialogVisible = false">取 消</el-button> <el-button @click="dialogVisible = false; form.remark = ''">取 消</el-button>
<el-button type="primary" :loading="loading" @click="onSubmitHandle">确 定</el-button> <el-button type="primary" :loading="loading" @click="onSubmitHandle">确 定</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -123,7 +123,7 @@ export default {
let res = await tbConCheck({ let res = await tbConCheck({
conInfoId: this.form.conInfoId, conInfoId: this.form.conInfoId,
lpNum: this.profitNumber, lpNum: this.profitNumber,
remark:this.form.remark remark: this.form.remark
}); });
this.detail.num = this.form.lpNum; this.detail.num = this.form.lpNum;
this.form.lpNum = 0; this.form.lpNum = 0;
@ -136,6 +136,7 @@ export default {
message: `添加成功`, message: `添加成功`,
type: "success" type: "success"
}); });
this.form.remark = ''
this.getTableData(); this.getTableData();
} catch (error) { } catch (error) {
this.loading = false; this.loading = false;

2
src/views/invoicing/consumable/cons_record.vue
View File

@ -158,7 +158,7 @@ export default {
}); });
this.clickseetableData.loading = false; this.clickseetableData.loading = false;
this.clickseetableData.data = res.content.map(v=>{ this.clickseetableData.data = res.content.map(v=>{
const productIds=v.productId.split(',') const productIds=v.productId?v.productId.split(','):[]
return{ return{
...v, ...v,
product:productIds.map((str,index)=>{ product:productIds.map((str,index)=>{

7
src/views/product/add_shop.vue
View File

@ -16,7 +16,7 @@
<el-form-item label="商品名称" prop="name"> <el-form-item label="商品名称" prop="name">
<el-input v-model="form.name" placeholder="请输入商品名称" style="width: 500px;"></el-input> <el-input v-model="form.name" placeholder="请输入商品名称" style="width: 500px;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="单位"> <el-form-item label="单位" prop="unitId">
<el-select v-model="form.unitId" placeholder="请选择单位" style="width: 500px;" @change="selectUnitt"> <el-select v-model="form.unitId" placeholder="请选择单位" style="width: 500px;" @change="selectUnitt">
<el-option :label="item.name" :value="item.id" v-for="item in units" :key="item.id"></el-option> <el-option :label="item.name" :value="item.id" v-for="item in units" :key="item.id"></el-option>
</el-select> </el-select>
@ -448,6 +448,11 @@ export default {
message: "请输入商品名称" message: "请输入商品名称"
} }
], ],
unitId: [{
required: true,
trigger: "change",
message: "请选择单位"
}],
categoryId: [ categoryId: [
{ {
required: true, required: true,

2
src/views/shop/shop_configuration.vue
View File

@ -5,7 +5,7 @@
<el-tab-pane label="基础配置" name="2"></el-tab-pane> <el-tab-pane label="基础配置" name="2"></el-tab-pane>
<!-- <el-tab-pane label="通知配置" name="3"></el-tab-pane> --> <!-- <el-tab-pane label="通知配置" name="3"></el-tab-pane> -->
<el-tab-pane label="安全设置" name="4"></el-tab-pane> <el-tab-pane label="安全设置" name="4"></el-tab-pane>
<!-- <el-tab-pane label="扩展参数" name="5"></el-tab-pane> --> <el-tab-pane label="扩展参数" name="5"></el-tab-pane>
</el-tabs> </el-tabs>
<shopInfo v-if="activeName == 1" /> <shopInfo v-if="activeName == 1" />