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

src/views/invoicing/consumable/information.vue

@@ -45,7 +45,7 @@
         <!-- <el-table-column label="类型id" prop="conTypeId" /> -->
         <el-table-column label="分类名称" prop="conTypeName" />
         <el-table-column label="单位" prop="conUnit" />
-        <el-table-column label="创建时间" prop="createTime">
+        <el-table-column label="创建时间" prop="createTime" width="200">
           <template v-slot="scope">
             {{ dayjs(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') }}
           </template>
@@ -60,14 +60,16 @@
         <el-table-column label="预警值" prop="conWarning" />
         <!-- <el-table-column label="单位耗材值" prop="surplusStock" /> -->
         <!-- <el-table-column label="排序" prop="sort" sortable /> -->
-        <el-table-column label="更新时间" prop="updateTime">
+        <el-table-column label="更新时间" prop="updateTime" width="200">
           <!-- <template v-slot="scope">
             {{ dayjs(scope.row.createdAt).format('YYYY-MM-DD HH:mm:ss') }}
           </template> -->
         </el-table-column>
-        <el-table-column label="操作">
+        <el-table-column label="操作" width="160" fixed="right">
           <template v-slot="scope">
             <el-button type="text" @click="clicksee(scope.row)">耗材记录</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> -->
@@ -196,6 +198,8 @@
           @current-change="paginationChangetype" />
       </div>
     </el-dialog>
+    <!-- 耗材盘点 -->
+    <AddConsTakin ref="AddConsTakin" @success="resetHandle" />
   </div>
 </template>
 
@@ -205,7 +209,9 @@ import dayjs from 'dayjs'
 import settings from '@/settings'
 import { upProSort } from '@/api/shop'
 import { gettbConsType, gettbConsInfo, posttbConsInfo, gettbConsInfoFlow, posttbConsInfostockIn, postapitbConsInfo } from '@/api/consumable'
+import AddConsTakin from '../components/addConsTakin'
 export default {
+  components: { AddConsTakin },
   data() {
     return {
       dayjs,
@@ -305,34 +311,8 @@ export default {
   mounted() {
     this.getTableData()
     this.getTableDatatype()
-    this.$nextTick(() => {
-      // this.tableDrag()
-    })
   },
   methods: {
-    //表格拖拽
-    tableDrag() {
-      const el = document.querySelector('#table_drag .el-table__body-wrapper tbody')
-      new Sortable(el, {
-        animation: 150,
-        onEnd: async e => {
-          if (e.oldIndex == e.newIndex) return
-          let oid = this.tableData.data[e.oldIndex].id
-          let nid = this.tableData.data[e.newIndex].id
-          let ids = this.tableData.data.map(item => item.id)
-          try {
-            await upProSort({
-              strId: oid,
-              endId: nid,
-              ids: ids
-            })
-            await this.getTableData()
-          } catch (error) {
-            console.log(error)
-          }
-        }
-      })
-    },
     // 重置查询
     resetHandle() {
       this.query.conTypeId = ''