UDI
/
udi-spms-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增采购类型,耗材字典bug修改

Browse Source
dev2.0.1
anthonywj 1 year ago
parent d73f3cc84e
commit 34663a8aae
9 changed files with 287 additions and 254 deletions
Show Stats Download Patch File Download Diff File

10
.env.production
Unescape Escape View File

@ -37,15 +37,15 @@ ENV = 'production'
# VUE_APP_BASE_API = 'http://dm.xmglxp.com:8081/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://dm.xmglxp.com:8081/UDI_SPMS_SERVER/'
# VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_SPMS_SERVER/' VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_SPMS_SERVER/'
#诏安医院 #诏安医院
# VUE_APP_BASE_API = 'http://139.9.174.242:9150/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://139.9.174.242:9150/UDI_SPMS_SERVER/'
# VUE_APP_BASE_API = 'http://192.168.0.17:9150/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://192.168.0.17:9150/UDI_SPMS_SERVER/'
# 大田 # 大田
# VUE_APP_BASE_API = 'http://110.83.220.178:9150/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://110.83.220.178:9150/UDI_SPMS_SERVER/'
# 云霄妇幼 # VUE_APP_BASE_API = 'http://122.112.160.36:9160/UDI_SPMS_SERVER/
# VUE_APP_BASE_API = 'http://122.112.160.36:9160/UDI_SPMS_SERVER/' # 云霄妇幼'
# VUE_APP_BASE_API = 'http://192.168.0.72:9150/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://192.168.0.72:9150/UDI_SPMS_SERVER/'
# 南靖 # 南靖
@ -58,10 +58,10 @@ VUE_APP_BASE_API = 'http://116.204.108.228:9150/UDI_SPMS_SERVER/'
# 应用访问路径 例如使用前缀 /admin/ # 应用访问路径 例如使用前缀 /admin/
# 域名 # 域名
VUE_APP_CONTEXT_PATH = '/' # VUE_APP_CONTEXT_PATH = '/'
# 其他 # 其他
# VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/' VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'
# 监控地址 # 监控地址
VUE_APP_MONITRO_ADMIN = '/admin/login' VUE_APP_MONITRO_ADMIN = '/admin/login'

15
src/views/basic/busType/bussinessTypeModify.vue
Unescape Escape View File

@ -360,7 +360,7 @@
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.scanPreIn" style="width: 65%" <el-select v-model="inputQuery.scanPreIn" style="width: 65%"
:disabled=" inputQuery.mainAction == 'WareHouseIn' || inputQuery.corpType !== 1 || inputQuery.advancePreIn==1 || inputQuery.vailInv==1" :disabled="inputQuery.useDyCount!=2 &&( inputQuery.advancePreIn==1 || inputQuery.vailInv==1)"
placeholder="是否启用"> placeholder="是否启用">
<el-option label="是" :value="true"></el-option> <el-option label="是" :value="true"></el-option>
<el-option label="否" :value="false"></el-option> <el-option label="否" :value="false"></el-option>
@ -380,7 +380,7 @@
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.advancePreIn" style="width: 65%" <el-select v-model="inputQuery.advancePreIn" style="width: 65%"
:disabled=" inputQuery.mainAction == 'WareHouseIn' || inputQuery.corpType !== 1 || inputQuery.scanPreIn==1 || inputQuery.vailInv==1" :disabled="inputQuery.useDyCount!=2 &&( inputQuery.scanPreIn==1 || inputQuery.vailInv==1)"
placeholder="是否启用"> placeholder="是否启用">
<el-option label="是" :value="true"></el-option> <el-option label="是" :value="true"></el-option>
<el-option label="否" :value="false"></el-option> <el-option label="否" :value="false"></el-option>
@ -400,7 +400,7 @@
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.vailInv" style="width: 65%" <el-select v-model="inputQuery.vailInv" style="width: 65%"
:disabled=" inputQuery.mainAction!= 'WareHouseOut' || inputQuery.advancePreIn==1 || inputQuery.scanPreIn==1" :disabled="inputQuery.useDyCount!=2 &&( inputQuery.mainAction!= 'WareHouseOut' || inputQuery.advancePreIn==1 || inputQuery.scanPreIn==1)"
placeholder="是否启用" placeholder="是否启用"
> >
<el-option label="是" :value="true"></el-option> <el-option label="是" :value="true"></el-option>
@ -416,7 +416,7 @@
<el-row> <el-row>
<el-col span="5"> <el-col span="5">
<span class="sptext">允许科室多次使用出库</span> <span class="sptext">物资使用出库模式</span>
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
@ -424,8 +424,9 @@
:disabled=" inputQuery.mainAction!= 'WareHouseOut' || inputQuery.corpType != 1" :disabled=" inputQuery.mainAction!= 'WareHouseOut' || inputQuery.corpType != 1"
placeholder="是否启用" placeholder="是否启用"
> >
<el-option label="是" :value="true"></el-option> <el-option label="正常" :value="0"></el-option>
<el-option label="否" :value="false"></el-option> <el-option label="物资多次使用出库" :value="1"></el-option>
<el-option label="科室集合出库" :value="2"></el-option>
</el-select> </el-select>
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
@ -1300,7 +1301,7 @@ export default {
if (this.inputQuery.corpType !== 1) { if (this.inputQuery.corpType !== 1) {
this.inputQuery.genUnit = false this.inputQuery.genUnit = false
this.inputQuery.useDyCount = false this.inputQuery.useDyCount = 0
} else { } else {
this.inputQuery.genUnit = this.oldData.genUnit this.inputQuery.genUnit = this.oldData.genUnit
this.inputQuery.useDyCount = this.oldData.useDyCount this.inputQuery.useDyCount = this.oldData.useDyCount

1
src/views/basic/product/product.vue
Unescape Escape View File

@ -2157,6 +2157,7 @@ export default {
}, },
handleModifyClick(_this,row) { handleModifyClick(_this,row) {
debugger
_this.uuid = row.uuid; _this.uuid = row.uuid;
_this.relId = row.id; _this.relId = row.id;
_this.isImport = false; _this.isImport = false;

29
src/views/basic/product/productEdit.vue
Unescape Escape View File

@ -331,20 +331,39 @@
</el-col> </el-col>
</el-row> </el-row>
<el-divider></el-divider> <el-divider></el-divider>
<!-- <el-row>-->
<!-- <el-col span="5">-->
<!-- <span class="sptext">是否寄售</span>-->
<!-- </el-col>-->
<!-- <el-divider direction="vertical"></el-divider>-->
<!-- <el-col span="5">-->
<!-- <el-select v-model="editQuery.isAdavence" style="width: 65%" placeholder="状态" clearable>-->
<!-- <el-option label="是" :value="true"></el-option>-->
<!-- <el-option label="否" :value="false"></el-option>-->
<!-- </el-select>-->
<!-- </el-col>-->
<!-- <el-divider direction="vertical"></el-divider>-->
<!-- <el-col span="13">-->
<!-- <span class="sptext">是否寄售</span>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-divider></el-divider>-->
<el-row> <el-row>
<el-col span="5"> <el-col span="5">
<span class="sptext">是否寄售</span> <span class="sptext">采购类型</span>
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="editQuery.isAdavence" style="width: 65%" placeholder="状态" clearable> <el-select v-model="editQuery.purType" style="width: 65%" placeholder="选择采购类型" clearable>
<el-option label="是" :value="true"></el-option> <el-option label="普通入账产品" :value="1"></el-option>
<el-option label="否" :value="false"></el-option> <el-option label="预验收产品" :value="2"></el-option>
<el-option label="寄售产品" :value="3"></el-option>
</el-select> </el-select>
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="13"> <el-col span="13">
<span class="sptext">是否寄售</span> <span class="sptext">采购类型</span>
</el-col> </el-col>
</el-row> </el-row>
<el-divider></el-divider> <el-divider></el-divider>

43
src/views/inout/IoCreateOrder.vue
Unescape Escape View File

@ -1,7 +1,8 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch"> <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini"
label-width="100px" v-show="showSearch">
<!-- <el-row>--> <!-- <el-row>-->
<!-- <el-col :span="8">--> <!-- <el-col :span="8">-->
<!-- <el-form-item class="query-form-item" label="单号:">--> <!-- <el-form-item class="query-form-item" label="单号:">-->
@ -82,7 +83,8 @@
<!-- </el-row>--> <!-- </el-row>-->
<el-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList"> <template v-for="(item, index) in queryList">
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id"> <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`" :key="item.id">
<el-input <el-input
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
@ -91,7 +93,8 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`"> <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-select v-model="filterQuery[item.columnName]" <el-select v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)" :disabled="executeEval(null,item.disabledFuc,false)"
@ -104,7 +107,8 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`"> <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-select <el-select
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
@ -122,7 +126,8 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`"> <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-date-picker <el-date-picker
:picker-options="pickerOptions" :picker-options="pickerOptions"
v-model="actDateRange" v-model="actDateRange"
@ -134,7 +139,8 @@
end-placeholder="结束日期" end-placeholder="结束日期"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`"> <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-date-picker <el-date-picker
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
:style="`width:${item.width+'px'}`" :style="`width:${item.width+'px'}`"
@ -160,7 +166,7 @@
>查询 >查询
</el-button </el-button
> >
<el-button type="primary" icon="el-icon-plus" @click="addOrders">新增单据</el-button> <el-button type="primary" icon="el-icon-plus" @click="addOrders(null,null)">新增单据</el-button>
</el-button-group> </el-button-group>
</div> </div>
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>
@ -265,7 +271,9 @@
:key="item.columnName" :key="item.columnName"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span> <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
item.lableRuleObj[scope.row[item.columnName]]
}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -278,8 +286,11 @@
:key="item.columnName" :key="item.columnName"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])"> <el-tag
<span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span> :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
<span>{{
item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
}}</span>
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
@ -314,7 +325,9 @@
:key="item.columnName" :key="item.columnName"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span> <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
scope.row[item.columnName]
}}</span>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
@ -570,10 +583,12 @@ export default {
} }
_this.errView = 0; _this.errView = 0;
_this.idQuery = {}; _this.idQuery = {};
_this.idQuery = row;
if (row != null && row.status === 4) { if (row != null && row.status === 4) {
_this.errView = 1; _this.errView = 1;
_this.idQuery = row;
} }
if (row != null)
_this.idQuery = row;
_this.addOrderVisible = true; _this.addOrderVisible = true;
}, },
closeDialog() { closeDialog() {
@ -634,14 +649,14 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
deleteDialog(_this,rowId) { deleteDialog(_this, row) {
_this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", { _this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
}) })
.then(() => { .then(() => {
_this.deleteOrders(rowId); _this.deleteOrders(row.billNo);
}) })
.catch(() => { .catch(() => {
}); });

27
src/views/supplier/company/basicCompanyproductEdit.vue
Unescape Escape View File

@ -71,7 +71,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row type="flex" class="edit-row"> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="产品价格:"> <el-form-item label="产品价格:">
<el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.price"></el-input> <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.price"></el-input>
@ -82,8 +82,20 @@
<el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.ybbm"></el-input> <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.ybbm"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="12">
<el-row type="flex" class="edit-row"> <el-form-item label="采购类型">
<el-select
v-model="editQuery.purType"
placeholder="请选择"
clearable
style="width: 80%"
>
<el-option label="普通入账产品" :value="1"></el-option>
<el-option label="预验收产品" :value="2"></el-option>
<el-option label="寄售产品" :value="3"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" v-if="productRemarkSet.remarkEnable1"> <el-col :span="12" v-if="productRemarkSet.remarkEnable1">
<el-form-item :label="productRemarkSet.remarkTitle1+':'"> <el-form-item :label="productRemarkSet.remarkTitle1+':'">
<el-input <el-input
@ -104,8 +116,6 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12" v-if="productRemarkSet.remarkEnable3"> <el-col :span="12" v-if="productRemarkSet.remarkEnable3">
<el-form-item :label="productRemarkSet.remarkTitle3+':'"> <el-form-item :label="productRemarkSet.remarkTitle3+':'">
<el-input <el-input
@ -126,8 +136,6 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12" v-if="productRemarkSet.remarkEnable5"> <el-col :span="12" v-if="productRemarkSet.remarkEnable5">
<el-form-item :label="productRemarkSet.remarkTitle5+':'"> <el-form-item :label="productRemarkSet.remarkTitle5+':'">
<el-input <el-input
@ -151,8 +159,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12" v-if="productRemarkSet.remarkEnable7"> <el-col :span="12" v-if="productRemarkSet.remarkEnable7">
<el-form-item :label="productRemarkSet.remarkTitle7+':'"> <el-form-item :label="productRemarkSet.remarkTitle7+':'">
<el-select <el-select
@ -201,8 +207,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="产品描述:"> <el-form-item label="产品描述:">
<el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.cpms"></el-input> <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.cpms"></el-input>
@ -326,6 +330,7 @@ export default {
price: this.editQuery.price, price: this.editQuery.price,
cpms: this.editQuery.cpms, cpms: this.editQuery.cpms,
ybbm: this.editQuery.ybbm, ybbm: this.editQuery.ybbm,
purType: this.editQuery.purType,
overStockNum: this.editQuery.overStockNum, overStockNum: this.editQuery.overStockNum,
lowStockNum: this.editQuery.lowStockNum, lowStockNum: this.editQuery.lowStockNum,
recentDateTime: this.editQuery.recentDateTime, recentDateTime: this.editQuery.recentDateTime,

71
src/views/supplier/products/selectDIDetailDialog.vue
Unescape Escape View File

@ -35,119 +35,111 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12" class="el-col"> <el-col :span="12">
<el-form-item label="商品条码:"> <el-form-item label="商品条码:">
<el-input style="width: 65%" size="small" :disabled="true" splaceholder="请输入内容" <el-input style="width: 65%" size="small" :disabled="true" splaceholder="请输入内容"
v-model="editQuery.sptm"></el-input> v-model="editQuery.sptm"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="el-col"> <el-col :span="12">
<el-form-item label="医保编码:"> <el-form-item label="医保编码:">
<el-input style="width: 65%" size="small" :disabled="true" splaceholder="请输入内容" v-model="editQuery.ybbm" <el-input style="width: 65%" size="small" :disabled="true" splaceholder="请输入内容" v-model="editQuery.ybbm"
@input="change($event)"></el-input> @input="change($event)"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="12">
<el-row>
<el-col :span="12" class="el-col">
<el-form-item label="计量单位:"> <el-form-item label="计量单位:">
<el-input style="width: 65%" size="small" :disabled="true" splaceholder="请输入内容" <el-input style="width: 65%" size="small" :disabled="true" splaceholder="请输入内容"
v-model="editQuery.measname"></el-input> v-model="editQuery.measname"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="el-col"> <el-col :span="12">
<el-form-item label="生产企业:"> <el-form-item label="生产企业:">
<el-input style="width: 65%" size="small" :disabled="true" v-model="editQuery.manufactory" <el-input style="width: 65%" size="small" :disabled="true" v-model="editQuery.manufactory"
splaceholder="请输入内容" @input="change($event)"></el-input> splaceholder="请输入内容" @input="change($event)"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="12">
<el-row>
<el-col :span="12" class="el-col">
<el-form-item label="商品名称:"> <el-form-item label="商品名称:">
<el-input style="width: 65%" size="small" :disabled="true" splaceholder="请输入内容" <el-input style="width: 65%" size="small" :disabled="true" splaceholder="请输入内容"
v-model="editQuery.cpmctymc"></el-input> v-model="editQuery.cpmctymc"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="el-col"> <el-col :span="12">
<el-form-item label="产品描述:"> <el-form-item label="产品描述:">
<el-input style="width: 65%" size="small" :disabled="true" splaceholder="请输入内容" <el-input style="width: 65%" size="small" :disabled="true" splaceholder="请输入内容"
v-model="editQuery.cpms"></el-input> v-model="editQuery.cpms"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="12">
<el-row>
<el-col :span="12" class="el-col">
<el-form-item label="产品价格:"> <el-form-item label="产品价格:">
<el-input style="width: 65%" size="small" :disabled="true" splaceholder="请输入内容" type="number" step="0.01" <el-input style="width: 65%" size="small" :disabled="true" splaceholder="请输入内容" type="number" step="0.01"
v-model="editQuery.price"></el-input> v-model="editQuery.price"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="12">
<el-form-item label="采购类型">
<el-select
<el-row> v-model="editQuery.purType"
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable1"> placeholder="请选择"
clearable
:disabled="true"
style="width: 65%"
>
<el-option label="普通入账产品" :value="1"></el-option>
<el-option label="预验收产品" :value="2"></el-option>
<el-option label="寄售产品" :value="3"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" v-if="productRemarkSet.remarkEnable1">
<el-form-item :label="productRemarkSet.remarkTitle1 "> <el-form-item :label="productRemarkSet.remarkTitle1 ">
<el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true" <el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true"
v-model="editQuery.basicPrductRemak1"></el-input> v-model="editQuery.basicPrductRemak1"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable2"> <el-col :span="12" v-if="productRemarkSet.remarkEnable2">
<el-form-item :label="productRemarkSet.remarkTitle2 "> <el-form-item :label="productRemarkSet.remarkTitle2 ">
<el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true" <el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true"
v-model="editQuery.basicPrductRemak2"></el-input> v-model="editQuery.basicPrductRemak2"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="12" v-if="productRemarkSet.remarkEnable3">
<el-row>
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable3">
<el-form-item :label="productRemarkSet.remarkTitle3 "> <el-form-item :label="productRemarkSet.remarkTitle3 ">
<el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true" <el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true"
v-model="editQuery.basicPrductRemak3"></el-input> v-model="editQuery.basicPrductRemak3"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable4"> <el-col :span="12" v-if="productRemarkSet.remarkEnable4">
<el-form-item :label="productRemarkSet.remarkTitle4 "> <el-form-item :label="productRemarkSet.remarkTitle4 ">
<el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true" <el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true"
v-model="editQuery.basicPrductRemak4"></el-input> v-model="editQuery.basicPrductRemak4"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="12" v-if="productRemarkSet.remarkEnable5">
<el-row>
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable5">
<el-form-item :label="productRemarkSet.remarkTitle5 "> <el-form-item :label="productRemarkSet.remarkTitle5 ">
<el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true" <el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true"
v-model="editQuery.basicPrductRemak5"></el-input> v-model="editQuery.basicPrductRemak5"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable6"> <el-col :span="12" v-if="productRemarkSet.remarkEnable6">
<el-form-item :label="productRemarkSet.remarkTitle6 "> <el-form-item :label="productRemarkSet.remarkTitle6 ">
<el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true" <el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true"
v-model="editQuery.basicPrductRemak6"></el-input> v-model="editQuery.basicPrductRemak6"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="12" v-if="productRemarkSet.remarkEnable7">
<el-row>
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable7">
<el-form-item :label="productRemarkSet.remarkTitle7 "> <el-form-item :label="productRemarkSet.remarkTitle7 ">
<el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true" <el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true"
v-model="editQuery.basicPrductRemak7"></el-input> v-model="editQuery.basicPrductRemak7"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable8"> <el-col :span="12" v-if="productRemarkSet.remarkEnable8">
<el-form-item :label="productRemarkSet.remarkTitle8"> <el-form-item :label="productRemarkSet.remarkTitle8">
<el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true" <el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true"
v-model="editQuery.basicPrductRemak8"></el-input> v-model="editQuery.basicPrductRemak8"></el-input>
@ -585,9 +577,6 @@ export default {
margin-bottom: 0px; margin-bottom: 0px;
} }
.el-row {
display: flex;
}
/* .el-col { /* .el-col {
border-radius: 4px; border-radius: 4px;

30
src/views/supplier/products/supAddDiProductSelectUdi.vue
Unescape Escape View File

@ -197,6 +197,20 @@
v-model="editQuery.price"></el-input> v-model="editQuery.price"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="el-col">
<el-form-item label="采购类型">
<el-select
v-model="editQuery.purType"
placeholder="请选择"
clearable
style="width: 65%"
>
<el-option label="普通入账产品" :value="1"></el-option>
<el-option label="预验收产品" :value="2"></el-option>
<el-option label="寄售产品" :value="3"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item
label="是否可集采:" label="是否可集采:"
@ -209,9 +223,6 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable1"> <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable1">
<el-form-item :label="productRemarkSet.remarkTitle1 "> <el-form-item :label="productRemarkSet.remarkTitle1 ">
<el-input style="width: 65%" size="small" splaceholder="请输入内容" <el-input style="width: 65%" size="small" splaceholder="请输入内容"
@ -225,9 +236,6 @@
v-model="editQuery.basicPrductRemak2"></el-input> v-model="editQuery.basicPrductRemak2"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable3"> <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable3">
<el-form-item :label="productRemarkSet.remarkTitle3 "> <el-form-item :label="productRemarkSet.remarkTitle3 ">
<el-input style="width: 65%" size="small" splaceholder="请输入内容" <el-input style="width: 65%" size="small" splaceholder="请输入内容"
@ -241,9 +249,6 @@
v-model="editQuery.basicPrductRemak4"></el-input> v-model="editQuery.basicPrductRemak4"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable5"> <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable5">
<el-form-item :label="productRemarkSet.remarkTitle5 "> <el-form-item :label="productRemarkSet.remarkTitle5 ">
<el-input style="width: 65%" size="small" splaceholder="请输入内容" <el-input style="width: 65%" size="small" splaceholder="请输入内容"
@ -257,16 +262,13 @@
v-model="editQuery.basicPrductRemak6" v-model="editQuery.basicPrductRemak6"
placeholder="请选择" placeholder="请选择"
clearable clearable
style="width: 80%" style="width: 65%"
> >
<el-option label="扣费" value="1"></el-option> <el-option label="扣费" value="1"></el-option>
<el-option label="不扣费" value="0"></el-option> <el-option label="不扣费" value="0"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable7"> <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable7">
<el-form-item :label="productRemarkSet.remarkTitle7 "> <el-form-item :label="productRemarkSet.remarkTitle7 ">
<el-select <el-select
@ -277,7 +279,7 @@
reserve-keyword reserve-keyword
placeholder="请选择物资类别" placeholder="请选择物资类别"
:remote-method="findThrTypeMethod" :remote-method="findThrTypeMethod"
style="width: 80%" style="width: 65%"
> >
<el-option <el-option
v-for="item in thrTypeOptions" v-for="item in thrTypeOptions"

1
src/views/system/param/busTypePre.vue
Unescape Escape View File

@ -149,6 +149,7 @@ export default {
auditStatus: null, auditStatus: null,
busAuditStatus: null, busAuditStatus: null,
createType: null, createType: null,
splitOrder: null,
}, },
enableMap: { enableMap: {
true: "全量补单", true: "全量补单",

Write Preview
Loading…
Cancel
Save