耗材列表新增修改

src/views/invoicing/consumable/information.vue

@@ -4,61 +4,24 @@
     <div class="head-container">
       <el-row :gutter="20">
         <el-col :span="3">
-          <el-input
+          <el-input v-model="query.conTypeId" size="small" clearable placeholder="请输入类型id" style="width: 100%;"
-            v-model="query.conTypeId"
+            class="filter-item" @keyup.enter.native="getTableData" />
-            size="small"
-            clearable
-            placeholder="请输入类型id"
-            style="width: 100%;"
-            class="filter-item"
-            @keyup.enter.native="getTableData"
-          />
         </el-col>
         <el-col :span="3">
-          <el-input
+          <el-input v-model="query.conTypeName" size="small" clearable placeholder="请输入类型名称" style="width: 100%;"
-            v-model="query.conTypeName"
+            class="filter-item" @keyup.enter.native="getTableData" />
-            size="small"
-            clearable
-            placeholder="请输入类型名称"
-            style="width: 100%;"
-            class="filter-item"
-            @keyup.enter.native="getTableData"
-          />
         </el-col>
         <el-col :span="3">
-          <el-input
+          <el-input v-model="query.conCode" size="small" clearable placeholder="请输入耗材代码" style="width: 100%;"
-            v-model="query.conCode"
+            class="filter-item" @keyup.enter.native="getTableData" />
-            size="small"
-            clearable
-            placeholder="请输入耗材代码"
-            style="width: 100%;"
-            class="filter-item"
-            @keyup.enter.native="getTableData"
-          />
         </el-col>
         <el-col :span="3">
-          <el-input
+          <el-input v-model="query.conName" size="small" clearable placeholder="请输入耗材名称" style="width: 100%;"
-            v-model="query.conName"
+            class="filter-item" @keyup.enter.native="getTableData" />
-            size="small"
-            clearable
-            placeholder="请输入耗材名称"
-            style="width: 100%;"
-            class="filter-item"
-            @keyup.enter.native="getTableData"
-          />
         </el-col>
         <el-col :span="3">
-          <el-select
+          <el-select v-model="query.status" placeholder="请选择商品规格" style="width: 100%;">
-            v-model="query.status"
+            <el-option :label="item.label" :value="item.value" v-for="item in typeEnums" :key="item.label" />
-            placeholder="请选择商品规格"
-            style="width: 100%;"
-          >
-            <el-option
-              :label="item.label"
-              :value="item.value"
-              v-for="item in typeEnums"
-              :key="item.label"
-            />
           </el-select>
         </el-col>
         <el-col :span="6">
@@ -70,22 +33,12 @@
     <div class="head-container">
       <el-row>
         <el-col>
-          <el-button
+          <el-button type="primary" icon="el-icon-plus" @click="clickdialogframe('add')">添加</el-button>
-            type="primary"
-            icon="el-icon-plus"
-            @click="clickdialogframe('add')"
-            >添加</el-button
-          >
         </el-col>
       </el-row>
     </div>
     <div class="head-container" id="table_drag">
-      <el-table
+      <el-table ref="table" :data="tableData.data" v-loading="tableData.loading" row-key="id">
-        ref="table"
-        :data="tableData.data"
-        v-loading="tableData.loading"
-        row-key="id"
-      >
         <el-table-column prop="id" label="ID" width="50px" />
         <el-table-column label="耗材名称" prop="conName" />
         <el-table-column label="耗材代码" prop="conCode" />
@@ -114,22 +67,10 @@
         </el-table-column>
         <el-table-column label="操作" width="180" fixed="right">
           <template v-slot="scope">
-            <el-button type="text" @click="editorHandle(scope.row)"
+            <el-button type="text" @click="editorHandle(scope.row)">编辑</el-button>
-              >编辑</el-button
+            <el-button type="text" @click="clicksee(scope.row)" style="margin-left: 10px !important;">耗材记录</el-button>
-            >
+            <el-button type="text" size="mini" style="margin-left: 10px !important;"
-            <el-button
+              @click="$refs.AddConsTakin.show(scope.row)">耗材盘点</el-button>
-              type="text"
-              @click="clicksee(scope.row)"
-              style="margin-left: 10px !important;"
-              >耗材记录</el-button
-            >
-            <el-button
-              type="text"
-              size="mini"
-              style="margin-left: 10px !important;"
-              @click="$refs.AddConsTakin.show(scope.row)"
-              >耗材盘点</el-button
-            >
             <!-- <el-button type="text" icon="el-icon-rank">排序</el-button> -->
             <!-- <el-button type="text" @click="clickdialogfadd(scope.row)"
               style="margin-left: 10px !important;">入库</el-button> -->
@@ -143,63 +84,40 @@
       </el-table>
     </div>
     <div class="head-container">
-      <el-pagination
+      <el-pagination :total="tableData.total" :current-page="tableData.page + 1" :page-size="tableData.size"
-        :total="tableData.total"
+        layout="total, sizes, prev, pager, next, jumper" @current-change="paginationChange" @size-change="e => {
-        :current-page="tableData.page + 1"
-        :page-size="tableData.size"
-        layout="total, sizes, prev, pager, next, jumper"
-        @current-change="paginationChange"
-        @size-change="
-          e => {
             tableData.size = e;
             tableData.page = 0;
             getTableData();
           }
-        "
+          " />
-      />
     </div>
     <!-- 耗材入库 -->
     <el-dialog title="耗材入库" :visible.sync="libraryshow">
-      <el-form
+      <el-form :inline="true" ref="reflibrary" :model="libraryshowdata" :rules="ruleslibrary" class="demo-form-inline">
-        :inline="true"
-        ref="reflibrary"
-        :model="libraryshowdata"
-        :rules="ruleslibrary"
-        class="demo-form-inline"
-      >
         <el-form-item label="耗材入库数量" prop="stockNumber">
-          <el-input
+          <el-input v-model.number="libraryshowdata.stockNumber" type="number" placeholder="请输入单位"></el-input>
-            v-model.number="libraryshowdata.stockNumber"
-            type="number"
-            placeholder="请输入单位"
-          ></el-input>
         </el-form-item>
         <el-form-item style="display: flex;justify-content: flex-end;">
           <el-button @click="libraryshow = false">取 消</el-button>
-          <el-button
+          <el-button type="primary" @click="clickdialoglibraryshow('reflibrary')">确 定</el-button>
-            type="primary"
-            @click="clickdialoglibraryshow('reflibrary')"
-            >确 定</el-button
-          >
         </el-form-item>
       </el-form>
     </el-dialog>
     <!-- 修改和增加 -->
     <el-dialog :title="dialogtitle" :visible.sync="dialogshow" width="70%">
-      <el-form
+      <el-form :inline="true" ref="refruleForm" :model="ruleForm" :rules="rules" class="demo-form-inline">
-        :inline="true"
-        ref="refruleForm"
-        :model="ruleForm"
-        :rules="rules"
-        class="demo-form-inline"
-      >
         <el-form-item label="单位" prop="conUnit" v-if="dialogtitle == '添加'">
-          <el-input
+          <el-input v-model="ruleForm.conUnit" placeholder="请输入单位"></el-input>
-            v-model="ruleForm.conUnit"
-            placeholder="请输入单位"
-          ></el-input>
         </el-form-item>
-        <el-form-item
+        <el-form-item label="耗材类型" prop="conTypeId" v-if="dialogtitle == '添加'">
+          <el-select v-model="ruleForm.conTypeId" placeholder="请选择">
+            <el-option v-for="item in this.tableData.data" :key="item.conTypeId" :label="item.conTypeName" :value="item.id">
+            </el-option>
+          </el-select>
+
+        </el-form-item>
+        <!-- <el-form-item
           label="耗材类型"
           prop="conNames"
           v-if="dialogtitle == '添加'"
@@ -209,46 +127,33 @@
             placeholder="请输耗材信息名称"
             disabled
           ></el-input>
-        </el-form-item>
+        </el-form-item>-->
-        <el-form-item v-if="dialogtitle == '添加'">
+        <!-- <el-form-item v-if="dialogtitle == '添加'">
           <el-button type="primary" @click="typedialogshow = true"
             >去选择</el-button
           >
-        </el-form-item>
+        </el-form-item>  -->
         <el-form-item label="耗材信息名称" prop="conName">
-          <el-input
+          <el-input v-model="ruleForm.conName" placeholder="请输入耗材信息名称"></el-input>
-            v-model="ruleForm.conName"
-            placeholder="请输入耗材信息名称"
-          ></el-input>
         </el-form-item>
-        <el-form-item label="耗材信息代码" prop="conCode">
+        <!-- <el-form-item label="耗材信息代码" prop="conCode">
           <el-input
             v-model="ruleForm.conCode"
             placeholder="请输入耗材信息代码"
           ></el-input>
+        </el-form-item> -->
+        <el-form-item label="耗材价格">
+          <el-input v-model="ruleForm.price" placeholder="请输入耗材价格"></el-input>
         </el-form-item>
-        <el-form-item label="耗材价格" prop="price">
+        <el-form-item label="预警值">
-          <el-input
+          <el-input v-model="ruleForm.conWarning" placeholder="请输入耗材预警值"></el-input>
-            v-model="ruleForm.price"
-            placeholder="请输入耗材价格"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="预警值" prop="conWarning">
-          <el-input
-            v-model="ruleForm.conWarning"
-            placeholder="请输入耗材预警值"
-          ></el-input>
         </el-form-item>
         <!-- <el-form-item label="单位耗材值" prop="surplusStock">
           <el-input v-model="ruleForm.surplusStock" placeholder="请输入单位耗材值"></el-input>
         </el-form-item> -->
         <el-form-item style="display: flex;justify-content: flex-end;">
           <el-button @click="dialogshow = false">取 消</el-button>
-          <el-button
+          <el-button type="primary" @click="submitForm('refruleForm')">
-            type="primary"
-            :loading="ruleFormLoading"
-            @click="submitForm('refruleForm')"
-          >
             确 定
           </el-button>
         </el-form-item>
@@ -256,47 +161,19 @@
     </el-dialog>
     <el-dialog title="选择类型" :visible.sync="typedialogshow">
       <div class="head-container">
-        <el-input
+        <el-input v-model="querytypedialogshowquery.conTypeName" size="small" clearable placeholder="请输入耗材类型名称"
-          v-model="querytypedialogshowquery.conTypeName"
+          style="width: 100%;" class="filter-item" @keyup.enter.native="getTableDatatype" />
-          size="small"
+        <el-input v-model="querytypedialogshowquery.conTypeCode" size="small" clearable placeholder="请输入耗材类型代码"
-          clearable
+          style="width: 100%;" class="filter-item" @keyup.enter.native="getTableDatatype" />
-          placeholder="请输入耗材类型名称"
+        <el-select v-model="querytypedialogshowquery.status" placeholder="请选择商品规格" style="width: 100%;">
-          style="width: 100%;"
+          <el-option :label="item.label" :value="item.value" v-for="item in typeEnums" :key="item.label" />
-          class="filter-item"
-          @keyup.enter.native="getTableDatatype"
-        />
-        <el-input
-          v-model="querytypedialogshowquery.conTypeCode"
-          size="small"
-          clearable
-          placeholder="请输入耗材类型代码"
-          style="width: 100%;"
-          class="filter-item"
-          @keyup.enter.native="getTableDatatype"
-        />
-        <el-select
-          v-model="querytypedialogshowquery.status"
-          placeholder="请选择商品规格"
-          style="width: 100%;"
-        >
-          <el-option
-            :label="item.label"
-            :value="item.value"
-            v-for="item in typeEnums"
-            :key="item.label"
-          />
         </el-select>
         <div style="margin-top: 10px;">
           <el-button type="primary" @click="getTableDatatype">查询</el-button>
           <el-button @click="resetHandletype">重置</el-button>
         </div>
       </div>
-      <el-table
+      <el-table ref="table" :data="tableDatatype.data" v-loading="tableDatatype.loading" row-key="id">
-        ref="table"
-        :data="tableDatatype.data"
-        v-loading="tableDatatype.loading"
-        row-key="id"
-      >
         <el-table-column label="耗材类型名称" prop="conTypeName" />
         <el-table-column label="耗材类型代码" prop="conTypeCode" />
         <el-table-column label="店铺ID" prop="shopId" />
@@ -313,30 +190,19 @@
         </el-table-column>
       </el-table>
       <div class="head-container">
-        <el-pagination
+        <el-pagination :total="tableDatatype.total" :current-page="tableDatatype.page + 1"
-          :total="tableDatatype.total"
+          :page-size="tableDatatype.size" layout="total, sizes, prev, pager, next, jumper"
-          :current-page="tableDatatype.page + 1"
+          @current-change="paginationChangetype" />
-          :page-size="tableDatatype.size"
-          layout="total, sizes, prev, pager, next, jumper"
-          @current-change="paginationChangetype"
-        />
       </div>
     </el-dialog>
     <el-dialog title="耗材信息" :visible.sync="clickseetypedialogshow">
       <div class="head-container">
-        <el-table
+        <el-table ref="table" :data="clickseetableData.data" v-loading="clickseetableData.loading" row-key="id"
-          ref="table"
+          height="450">
-          :data="clickseetableData.data"
-          v-loading="clickseetableData.loading"
-          row-key="id"
-          height="450"
-        >
           <el-table-column label="耗材名称" prop="conName" />
           <el-table-column label="变动库存" prop="amount">
             <template v-slot="scope">
-              <span :class="{ red: scope.row.bizType == '-' }"
+              <span :class="{ red: scope.row.bizType == '-' }">{{ scope.row.bizType }}{{ scope.row.amount }}</span>
-                >{{ scope.row.bizType }}{{ scope.row.amount }}</span
-              >
             </template>
           </el-table-column>
           <el-table-column label="现有库存" prop="balance" />
@@ -344,10 +210,7 @@
           <el-table-column label="业务说明" prop="bizName" />
           <!-- <el-table-column label="正负号标识" prop="bizType" /> -->
           <!-- <el-table-column label="耗材id" prop="consId" /> -->
-          <el-table-column
+          <el-table-column label="商品信息" prop="productName"></el-table-column>
-            label="商品信息"
-            prop="productName"
-          ></el-table-column>
           <el-table-column label="创建时间" prop="createTime"></el-table-column>
           <!-- <el-table-column label="更新时间" prop="updateTime">
           <template v-slot="scope">
@@ -357,13 +220,9 @@
         </el-table>
       </div>
       <div class="head-container">
-        <el-pagination
+        <el-pagination :total="clickseetableData.total" :current-page="clickseetableData.page + 1"
-          :total="clickseetableData.total"
+          :page-size="clickseetableData.size" layout="total, sizes, prev, pager, next, jumper"
-          :current-page="clickseetableData.page + 1"
+          @current-change="paginationChangetype" />
-          :page-size="clickseetableData.size"
-          layout="total, sizes, prev, pager, next, jumper"
-          @current-change="paginationChangetype"
-        />
       </div>
     </el-dialog>
     <!-- 耗材盘点 -->
@@ -452,11 +311,11 @@ export default {
         conCode: "",
         conName: "",
         conTypeId: "",
-        price: "",
+        price: "0",
         conNames: "",
         // surplusStock: '',
         conUnit: "",
-        conWarning: "",
+        conWarning: "999",
         shopId: localStorage.getItem("shopId")
       },
       rules: {
@@ -466,7 +325,7 @@ export default {
         conName: [
           { required: true, message: "请输入耗材信息名称", trigger: "blur" }
         ],
-        conNames: [
+        conTypeId: [
           { required: true, message: "请选择耗材类型", trigger: "blur" }
         ],
         price: [{ required: true, message: "请输入耗材价格", trigger: "blur" }],
@@ -535,6 +394,7 @@ export default {
         this.tableData.loading = false;
         this.tableData.data = res.content;
         this.tableData.total = res.totalElements;
+
       } catch (error) {
         console.log(error);
       }
@@ -624,6 +484,7 @@ export default {
             this.dialogshow = false;
           } else {
             //添加
+            console.log(this.ruleForm,'调试')
             await posttbConsInfo({
               ...this.ruleForm
             });