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

src/views/devices/details.vue

@@ -74,10 +74,10 @@
                 </el-radio-group>
             </el-form-item>
             <el-form-item label="打印方式">
-                <el-radio-group v-model="forms.print_method">
+                <el-radio-group v-model="forms.printMethod">
                     <el-radio label="all">打印全部</el-radio>
                     <el-radio label="normal">仅打印结账单[前台]</el-radio>
-                    <el-radio label="one">仅打印结账单</el-radio>
+                    <el-radio label="one">仅打印制作单[厨房]</el-radio>
                 </el-radio-group>
             </el-form-item>
             <el-form-item label="打印类型">

src/views/invoicing/components/consumableList.vue

@@ -1,6 +1,6 @@
 <!-- 耗材列表 -->
 <template>
-    <el-dialog title="选择耗材" :visible.sync="dialogVisible" @open="resetHandle()">
+    <el-dialog title="选择耗材" :visible.sync="dialogVisible">
         <el-form :model="searchForm" inline>
             <el-form-item>
                 <el-input v-model="searchForm.conTypeName" placeholder="耗材类型名称" @input="onInput"></el-input>
@@ -162,7 +162,6 @@ export default {
                 this.goods = []
             }
             this.resetHandle()
-            this.getTableData()
         },
         close() {
             this.dialogVisible = false

src/views/invoicing/components/shopList.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="选择商品" :visible.sync="dialogVisible" @open="resetHandle()" @close="reset" top="5vh">
+    <el-dialog title="选择商品" :visible.sync="dialogVisible" @close="reset" top="5vh">
         <el-form :model="searhForm" inline>
             <el-form-item>
                 <el-input v-model="searhForm.name" placeholder="商品名称" @input="onInput"></el-input>
@@ -192,9 +192,8 @@ export default {
             } else {
                 this.goods = []
             }
-            this.resetHandle()
             this.tbShopCategoryGet()
-            this.getTableData()
+            this.resetHandle()
         },
         close() {
             this.dialogVisible = false

src/views/invoicing/consumable/specifications.vue

@@ -56,7 +56,7 @@
         </el-col>
       </el-row>
     </div>
-    <div class="head-container">
+    <!-- <div class="head-container">
       <el-row>
         <el-col>
           <el-button
@@ -67,7 +67,7 @@
           >
         </el-col>
       </el-row>
-    </div>
+    </div> -->
     <div class="head-container" id="table_drag">
       <el-table
         ref="table"

src/views/invoicing/operation_in.vue

@@ -275,7 +275,7 @@ export default {
                 remark: '',
                 time: dayjs().format('YYYY-MM-DD'),
                 totalAmount: 0,
-                type: 'purveyor',
+                type: 'in',
                 shopId: localStorage.getItem('shopId')
             },
             queryRules: {
@@ -503,7 +503,7 @@ export default {
                 item.number = formatDecimal(item.stockNumber - item.stockConsume, 2, true)
                 item.stockNumber = 0
                 item.costPrice = item.price
-                item.conInfold = item.id
+                item.conInfoId = item.id
                 return item
             })
             this.tableData.list = [...this.tableData.list, ...arr]

src/views/invoicing/operation_out.vue

@@ -466,7 +466,7 @@ export default {
                 item.number = formatDecimal(item.stockNumber - item.stockConsume, 2, true)
                 item.stockNumber = 0
                 item.costPrice = item.price
-                item.conInfold = item.id
+                item.conInfoId = item.id
                 return item
             })
             this.tableData.list = [...this.tableData.list, ...arr]

src/views/order_manage/components/orderDetail.vue

@@ -47,7 +47,7 @@
         <div class="item">
           <div class="t">支付时间</div>
           <div class="b">
-            {{ detail.createdAt | paidTime | timeFilter }}
+            {{ detail.createdAt | timeFilter }}
           </div>
         </div>
       </div>