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

src/views/invoicing/consumable/information.vue

@@ -60,15 +60,12 @@
             {{ dayjs(scope.row.createdAt).format('YYYY-MM-DD HH:mm:ss') }}
           </template> -->
         </el-table-column>
-        <el-table-column label="耗材记录">
-          <template v-slot="scope">
-            <el-button type="text" @click="clicksee(scope.row)">查看</el-button>
-          </template>
-        </el-table-column>
         <el-table-column label="操作">
           <template v-slot="scope">
+            <el-button type="text" @click="clicksee(scope.row)">耗材记录</el-button>
             <!-- <el-button type="text" icon="el-icon-rank">排序</el-button> -->
-            <el-button type="text" @click="clickdialogfadd(scope.row)">编辑</el-button>
+            <!-- <el-button type="text" @click="clickdialogfadd(scope.row)"
+              style="margin-left: 10px !important;">入库</el-button> -->
             <!-- <el-button type="text" icon="el-icon-edit" @click="clickdialogframe('edit', scope.row)">编辑</el-button> -->
             <!-- <el-popconfirm title="确定删除吗？" @confirm="delTableHandle([scope.row.id])">
               <el-button type="text" icon="el-icon-delete" style="margin-left: 20px !important;"
@@ -95,7 +92,7 @@
       </el-form>
     </el-dialog>
     <!-- 修改和增加 -->
-    <el-dialog :title="dialogtitle" :visible.sync="dialogshow" width="70%" >
+    <el-dialog :title="dialogtitle" :visible.sync="dialogshow" width="70%">
       <el-form :inline="true" ref="refruleForm" :model="ruleForm" :rules="rules" class="demo-form-inline">
         <el-form-item label="单位" prop="conUnit" v-if="dialogtitle == '添加'">
           <el-input v-model="ruleForm.conUnit" placeholder="请输入单位"></el-input>
@@ -258,8 +255,8 @@ export default {
         conCode: '',
         conName: '',
         conTypeId: '',
-        price:"",
-        conNames:"",
+        price: "",
+        conNames: "",
         // surplusStock: '',
         conUnit: '',
         conWarning: '',
@@ -389,7 +386,7 @@ export default {
     // 选择的类型
     tableDatatypetable(item) {
       this.ruleForm.conCode = item.conTypeCode
-      this.ruleForm.conNames = item.conTypeName 
+      this.ruleForm.conNames = item.conTypeName
       this.ruleForm.conTypeId = item.id
       this.typedialogshow = false
     },
@@ -438,7 +435,7 @@ export default {
       this.$refs[formName].validate(async (valid) => {
         if (valid) {
           if (this.dialogtitle == '编辑') {
-         
+
             await postapitbConsInfo({
               id: this.ruleForm.id,
               conCode: this.ruleForm.conCode,
@@ -452,9 +449,9 @@ export default {
             this.dialogshow = false
           } else {//添加
             await posttbConsInfo({
-             ...this.ruleForm
+              ...this.ruleForm
             })
-            this.$message({type:'success',message:'添加成功'})
+            this.$message({ type: 'success', message: '添加成功' })
           }
           this.dialogshow = false
           this.$refs[formName].resetFields()