diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index 16169242..2c9d7550 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -56,6 +56,7 @@
</el-table>
</el-card>
+ <el-card>
<el-row type="flex" class="edit-row" style="margin-top: 20px">
<el-col :span="12">
<el-form-item label="计量单位:" label-width="140px">
@@ -200,178 +201,308 @@
</el-form-item>
</el-col>
</el-row>
+ </el-card>
+
+ <div style="margin: 12px 12px 12px 24px;font-size: 18px;font-weight: bold;" @click="chang">高级设置</div>
+ <div style="width: 97%;margin: 0 auto" v-show="isCart">
+ <el-descriptions class="margin-top" :column="3" size="mini" border>
+ <el-descriptions-item :labelStyle='labelStyle' :contentStyle='contentStyle1'>库存积压预警数量</el-descriptions-item>
+ <el-descriptions-item :labelStyle='labelStyle' :contentStyle='contentStyle'>
+ <el-input style="width: 100%" size="small" splaceholder="请输入内容" :disabled="this.useNumEnable" type="number" v-model="editQuery.overStockNum"></el-input>
+ </el-descriptions-item>
+ <el-descriptions-item :labelStyle='labelStyle1'>
+ <template slot="label">
+ <i class="el-icon-tickets"></i>
+ 描述
+ </template>
+ 库存积压预警数量
+ </el-descriptions-item>
+ <el-descriptions-item>
+ 低库存预警数量
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <el-input style="width: 100%" size="small" splaceholder="请输入内容" :disabled="this.useNumEnable" type="number" v-model="editQuery.lowStockNum"></el-input>
+ </el-descriptions-item>
+ <el-descriptions-item :labelStyle='labelStyle1'>
+ <template slot="label">
+ <i class="el-icon-tickets"></i>
+ 描述
+ </template>
+ 低库存预警数量
+ </el-descriptions-item>
+
+
+ <el-descriptions-item>
+
+ 最小包装可使用次数
+ </el-descriptions-item>
+ <el-descriptions-item>
+
+ <el-input style="width: 100%" size="small" splaceholder="请输入内容" :disabled="this.useNumEnable" type="number" v-model="editQuery.useNum"></el-input>
+ </el-descriptions-item>
+ <el-descriptions-item :labelStyle='labelStyle1'>
+ <template slot="label">
+ <i class="el-icon-tickets"></i>
+ 描述
+ </template>
+ 最小包装可使用次数
+ </el-descriptions-item>
+
+
+ <el-descriptions-item>
+
+ 近效期预警时间
+ </el-descriptions-item>
+ <el-descriptions-item>
+
+ <el-input style="width: 100%" size="small" splaceholder="请输入内容" :disabled="this.useNumEnable" type="number" v-model="editQuery.recentDateTime"></el-input>
+ </el-descriptions-item>
+ <el-descriptions-item :labelStyle='labelStyle1'>
+ <template slot="label">
+ <i class="el-icon-tickets"></i>
+ 描述
+ </template>
+ 近效期预警时间
+ </el-descriptions-item>
+
+ <el-descriptions-item>
+
+ 使用周期(天)
+ </el-descriptions-item>
+ <el-descriptions-item>
+
+ <el-input style="width: 100%" size="small" splaceholder="请输入内容" :disabled="this.useNumEnable" type="number" v-model="editQuery.useExpireTime"></el-input>
+ </el-descriptions-item>
+ <el-descriptions-item :labelStyle='labelStyle1'>
+ <template slot="label">
+ <i class="el-icon-tickets"></i>
+ 描述
+ </template>
+ 使用周期(天)
+ </el-descriptions-item>
+
+ <el-descriptions-item>
+
+ 物资分类
+ </el-descriptions-item>
+ <el-descriptions-item>
- <el-collapse v-model="activeNames">
- <el-collapse-item title="高级设置" name="1" class="titel">
- <div style="width: 85%;margin: 0 auto">
- <el-row>
- <el-col :span="12">
- <el-form-item label="库存积压预警数量:" label-width="150px">
- <el-input style="width: 80%" size="small" splaceholder="请输入内容" :disabled="this.useNumEnable" type="number" v-model="editQuery.overStockNum"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="低库存预警数量:" label-width="150px" >
- <el-input style="width: 80%" size="small" splaceholder="请输入内容" type="number" v-model="editQuery.lowStockNum"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
-
- <el-row>
- <el-col :span="12">
- <el-form-item label="最小包装可使用次数:" label-width="150px">
- <el-input style="width: 80%" size="small" splaceholder="请输入内容" :disabled="this.useNumEnable" type="number"v-model="editQuery.useNum"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="近效期预警时间:" label-width="150px">
- <el-input style="width: 80%" size="small" splaceholder="请输入内容" type="number" v-model="editQuery.recentDateTime"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
-
- <el-row>
- <el-col :span="12">
- <el-form-item label="使用周期(天):" label-width="150px">
- <el-input style="width: 80%" size="small" type="number" splaceholder="请输入内容" v-model="editQuery.useExpireTime"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12" class="el-col">
- <el-form-item label="上级菜单:" label-width="150px">
<treeselect
v-model="editQuery.relCode"
:options="fromDeptOptions"
:normalizer="normalizer"
:show-count="true"
- style="width: 80%"
- placeholder="选择上级菜单"
+ style="width:280px;"
+ placeholder="选择物资分类"
/>
- </el-form-item>
- </el-col>
- </el-row>
-
- <el-row type="flex">
- <el-col>
- <div style="margin-bottom: 18px;margin-left: 25px">
- <el-col :span="12">
- <el-form-item label="是否禁用:" label-width="125px" >
- <el-radio-group v-model="editQuery.isDisable">
- <el-radio :label='true' @change="diableChange">是</el-radio>
- <el-radio :label='false'>否</el-radio>
- </el-radio-group>
- </el-form-item>
- </el-col>
-
- <el-col :span="12">
- <el-form-item label="是否寄售:" label-width="125px">
- <el-radio-group v-model="editQuery.isAdavence">
- <el-radio :label='true'>是</el-radio>
- <el-radio :label='false'>否</el-radio>
- </el-radio-group>
- </el-form-item>
- </el-col>
- </div>
- </el-col>
- </el-row>
-
- <el-row type="flex">
- <el-col>
- <div style="margin-bottom: 18px;margin-left: 25px">
- <el-col :span="12">
- <el-form-item label="允许无批次:" label-width="125px" >
- <el-radio-group v-model="editQuery.allowNoBatch" >
- <el-radio :label='true'>允许</el-radio>
- <el-radio :label='false'>不允许</el-radio>
- </el-radio-group>
- </el-form-item>
- </el-col>
-
- <el-col :span="12">
- <el-form-item label="允许无失效日期:" label-width="125px">
- <el-radio-group v-model="editQuery.allowNoExpire">
- <el-radio :label='true'>允许</el-radio>
- <el-radio :label='false'>不允许</el-radio>
- </el-radio-group>
- </el-form-item>
- </el-col>
- </div>
- </el-col>
- </el-row>
-
-
- <el-row type="flex">
- <el-col>
- <div style="margin-bottom: 18px;margin-left: 25px">
- <el-col :span="12">
- <el-form-item label="允许无生产日期:" label-width="125px" >
- <el-radio-group v-model="editQuery.allowNoProduct" >
- <el-radio :label='true'>允许</el-radio>
- <el-radio :label='false'>不允许</el-radio>
- </el-radio-group>
- </el-form-item>
- </el-col>
-
- <el-col :span="12">
- <el-form-item label="启用使用单元:" label-width="125px">
- <el-radio-group v-model="checked" >
- <el-radio :disabled="!isUseDyCheck || editQuery.useMuti==true " :label='true' @change="useDyCheckChange">是</el-radio>
- <el-radio :disabled="!isUseDyCheck || editQuery.useMuti==true " :label='false'>否</el-radio>
- </el-radio-group>
- </el-form-item>
- </el-col>
- </div>
- </el-col>
- </el-row>
-
- <el-row type="flex">
- <el-col>
- <div style="margin-bottom: 18px;margin-left: 25px">
- <el-col :span="12">
- <el-form-item label="多次/重复使用耗材:" label-width="125px" >
- <el-radio-group v-model="editQuery.useMuti" >
- <el-radio :label='true' :disabled="checked" @change="useMutiChange">允许</el-radio>
- <el-radio :label='false':disabled="checked">不允许</el-radio>
- </el-radio-group>
- </el-form-item>
- </el-col>
-
- <el-col :span="12">
- <el-form-item label="是否可配送:" label-width="125px">
- <el-radio-group v-model="editQuery.dispatch" >
- <el-radio :label='true' @change="useDyCheckChange">是</el-radio>
- <el-radio :label='false'>否</el-radio>
- </el-radio-group>
- </el-form-item>
- </el-col>
- </div>
- </el-col>
- </el-row>
-
- <el-row type="flex">
- <el-col>
- <div style="margin-bottom: 18px;margin-left: 25px">
- <el-col :span="12">
- <el-form-item label="是否集采产品:" label-width="125px" >
- <el-radio-group v-model="editQuery.groupBuy" >
- <el-radio :label='true' @change="groupBuyChange">允许</el-radio>
- <el-radio :label='false' >不允许</el-radio>
- </el-radio-group>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="预警时间格式:" label-width="125px">
- <el-radio-group v-model="editQuery.isDateBy">
- <el-radio :label=1>天</el-radio>
- <el-radio :label=2>小时</el-radio>
- </el-radio-group>
- </el-form-item>
- </el-col>
- </div>
- </el-col>
- </el-row>
- </div>
- </el-collapse-item>
- </el-collapse>
+<!-- <el-input style="width: 100%" size="small" splaceholder="请输入内容" :disabled="this.useNumEnable" type="number" v-model="editQuery.useExpireTime"></el-input>-->
+
+ </el-descriptions-item>
+ <el-descriptions-item :labelStyle='labelStyle1'>
+ <template slot="label">
+ <i class="el-icon-tickets"></i>
+ 描述
+ </template>
+ 物资分类
+ </el-descriptions-item>
+
+
+ <el-descriptions-item>
+
+ 是否禁用
+ </el-descriptions-item>
+ <el-descriptions-item>
+
+ <el-radio-group v-model="editQuery.isDisable">
+ <el-radio :label="true" :value="true">是</el-radio>
+ <el-radio :label="false" :value="false">否</el-radio>
+ </el-radio-group>
+ </el-descriptions-item>
+ <el-descriptions-item :labelStyle='labelStyle1'>
+ <template slot="label">
+ <i class="el-icon-tickets"></i>
+ 描述
+ </template>
+ 是否禁用
+ </el-descriptions-item>
+
+ <el-descriptions-item>
+
+ 是否寄售
+ </el-descriptions-item>
+ <el-descriptions-item>
+
+ <el-radio-group v-model="editQuery.isAdavence">
+ <el-radio :label="true" :value="true">是</el-radio>
+ <el-radio :label="false" :value="false">否</el-radio>
+ </el-radio-group>
+ </el-descriptions-item>
+ <el-descriptions-item :labelStyle='labelStyle1'>
+ <template slot="label">
+ <i class="el-icon-tickets"></i>
+ 描述
+ </template>
+ 是否寄售
+ </el-descriptions-item>
+
+
+
+ <el-descriptions-item>
+
+ 多次/重复使用耗材
+ </el-descriptions-item>
+ <el-descriptions-item>
+
+ <el-radio-group v-model="editQuery.useMuti">
+ <el-radio :label="true" :value="true">是</el-radio>
+ <el-radio :label="false" :value="false">否</el-radio>
+ </el-radio-group>
+ </el-descriptions-item>
+ <el-descriptions-item :labelStyle='labelStyle1'>
+ <template slot="label">
+ <i class="el-icon-tickets"></i>
+ 描述
+ </template>
+ 多次/重复使用耗材
+ </el-descriptions-item>
+
+
+ <el-descriptions-item>
+
+ 是否可配送
+ </el-descriptions-item>
+ <el-descriptions-item>
+
+ <el-radio-group v-model="editQuery.dispatch">
+ <el-radio :label="true" :value="true">是</el-radio>
+ <el-radio :label="false" :value="false">否</el-radio>
+ </el-radio-group>
+ </el-descriptions-item>
+ <el-descriptions-item :labelStyle='labelStyle1'>
+ <template slot="label">
+ <i class="el-icon-tickets"></i>
+ 描述
+ </template>
+ 是否可配送
+ </el-descriptions-item>
+ <el-descriptions-item>
+
+ 是否集采产品
+ </el-descriptions-item>
+ <el-descriptions-item>
+
+ <el-radio-group v-model="editQuery.groupBuy">
+ <el-radio :label="true" :value="true">是</el-radio>
+ <el-radio :label="false" :value="false">否</el-radio>
+ </el-radio-group>
+ </el-descriptions-item>
+ <el-descriptions-item :labelStyle='labelStyle1'>
+ <template slot="label">
+ <i class="el-icon-tickets"></i>
+ 描述
+ </template>
+ 是否集采产品
+ </el-descriptions-item>
+
+
+ <el-descriptions-item>
+
+ 允许无批次
+ </el-descriptions-item>
+ <el-descriptions-item>
+
+ <el-radio-group v-model="editQuery.allowNoBatch">
+ <el-radio :label="true" :value="true">允许</el-radio>
+ <el-radio :label="false" :value="false">不允许</el-radio>
+ </el-radio-group>
+ </el-descriptions-item>
+ <el-descriptions-item :labelStyle='labelStyle1'>
+ <template slot="label">
+ <i class="el-icon-tickets"></i>
+ 描述
+ </template>
+ 允许无批次
+ </el-descriptions-item>
+
+ <el-descriptions-item>
+
+ 允许无失效日期
+ </el-descriptions-item>
+ <el-descriptions-item>
+
+ <el-radio-group v-model="editQuery.allowNoExpire">
+ <el-radio :label="true" :value="true">允许</el-radio>
+ <el-radio :label="false" :value="false">不允许</el-radio>
+ </el-radio-group>
+ </el-descriptions-item>
+ <el-descriptions-item :labelStyle='labelStyle1'>
+ <template slot="label">
+ <i class="el-icon-tickets"></i>
+ 描述
+ </template>
+ 允许无失效日期
+ </el-descriptions-item>
+
+ <el-descriptions-item>
+
+ 允许无生产日期
+ </el-descriptions-item>
+ <el-descriptions-item>
+
+ <el-radio-group v-model="editQuery.allowNoProduct">
+ <el-radio :label="true" :value="true">允许</el-radio>
+ <el-radio :label="false" :value="false">不允许</el-radio>
+ </el-radio-group>
+ </el-descriptions-item>
+ <el-descriptions-item :labelStyle='labelStyle1'>
+ <template slot="label">
+ <i class="el-icon-tickets"></i>
+ 描述
+ </template>
+ 允许无生产日期
+ </el-descriptions-item>
+
+ <el-descriptions-item>
+
+ 预警时间格式
+ </el-descriptions-item>
+ <el-descriptions-item>
+
+ <el-radio-group v-model="editQuery.isDateBy">
+ <el-radio :label="1" :value="1">天</el-radio>
+ <el-radio :label="2" :value="2">小时</el-radio>
+ </el-radio-group>
+ </el-descriptions-item>
+ <el-descriptions-item :labelStyle='labelStyle1'>
+ <template slot="label">
+ <i class="el-icon-tickets"></i>
+ 描述
+ </template>
+ 预警时间格式
+ </el-descriptions-item>
+
+ <el-descriptions-item>
+
+ 启用使用单元
+ </el-descriptions-item>
+ <el-descriptions-item>
+
+ <el-radio-group v-model="checked">
+ <el-radio :label="true" :value="true">启用</el-radio>
+ <el-radio :label="false" :value="false">不启用</el-radio>
+ </el-radio-group>
+ </el-descriptions-item>
+ <el-descriptions-item :labelStyle='labelStyle1'>
+ <template slot="label">
+ <i class="el-icon-tickets"></i>
+ 描述
+ </template>
+ 启用使用单元
+ </el-descriptions-item>
+ </el-descriptions>
+
+ </div>
+
</el-form>
@@ -480,6 +611,7 @@ export default {
fromDeptOptions: [],
selectErpDialogVisible: false, //选入ERP产品
editSingleDiDialogVisible: false,
+ isCart:false,
editSingleFormat: {
uuid: null,
relId: null,
@@ -488,6 +620,19 @@ export default {
measname: null,
nameCode: null
},
+ labelStyle: { 'width': '000px' },
+ labelStyle1: {
+ 'width': '100px' ,
+ 'font-weight': '900',
+ 'font-size': '14px',
+ 'color' : '#141414'
+ },
+ contentStyle: {
+ 'width': '300px',
+ },
+ contentStyle1: {
+ 'width': '200px'
+ },
}
},
components: {
@@ -531,6 +676,9 @@ export default {
this.isImport = false;
this.selectErpDialogVisible = true;
},
+ chang(){
+ this.isCart=!this.isCart;
+ },
removeDi() {
this.$confirm("此操作将解除该绑定DI器械信息, 是否继续?", "提示", {
confirmButtonText: "确定",
diff --git a/src/views/inout/receive/receiveAdd.vue b/src/views/inout/receive/receiveAdd.vue
index 6c0bc7b6..268cb2aa 100644
--- a/src/views/inout/receive/receiveAdd.vue
+++ b/src/views/inout/receive/receiveAdd.vue
@@ -63,7 +63,7 @@
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true" border @current-change="handleDetail">
<el-table-column label="序号" type="index" width="60"></el-table-column>
- <el-table-column label="领用类型" prop="billTypeName"></el-table-column>
+ <el-table-column label="领用类型" prop="billType"></el-table-column>
<el-table-column label="单据号" prop="billNo"></el-table-column>
<el-table-column label="领用仓库" prop="invName"></el-table-column>
<el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true"></el-table-column>