Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web

src/components/inventory/apply/AddApply.vue

@@ -144,6 +144,8 @@ import Mask from "@/components/common/Mask.vue";
 const isShow = ref<any>(false)
 const emit = defineEmits(['close'])
 const exit = () => {
+  initFormData()
+  tableList.value = []
   isShow.value = false
   emit('close')
 }
@@ -154,6 +156,14 @@ const formData = ref({
   username: "",
   remark: ''
 })
+const initFormData = () => {
+  formData.value = {
+    useUserId: null,
+    name: '',
+    username: "",
+    remark: ''
+  }
+}
 
 interface Inventory {
   goodId: string | number;

src/views/inventory/apply.vue

@@ -34,8 +34,38 @@
     <div class="content">
       <el-table :data="dataList" style="width: 100%;height: 100%" @row-click="rowClick" :header-cell-style="{ backgroundColor: '#F1F5FB' }">
         <el-table-column prop="useCode" label="单号" width="180"></el-table-column>
-        <el-table-column prop="status" label="状态" width="180"></el-table-column>
+        <el-table-column prop="status" label="状态" width="180">
-        <el-table-column prop="useUserId" label="领用人" width="180"></el-table-column>
+          <template #default="scope">
+            {{ scope.row.status==1?"已完成":scope.row.status==0?"未完成":"未知" }}
+          </template>
+
+        </el-table-column>
+        <el-table-column prop="kindCount" label="品种" width="180">
+          <template #default="scope">
+            {{ scope.row.kindCount}}种
+          </template>
+
+        </el-table-column>
+        <el-table-column label="盈亏数量" prop="changeTotalWholeCount" width="100">
+          <template #default="scope">
+            {{scope.row.changeTotalWholeCount > 0 ? '+' : ''}}{{ scope.row.changeTotalWholeCount }}
+          </template>
+        </el-table-column>
+        <el-table-column label="盈亏金额(进价)" prop="totalPurchasePrice" width="200">
+          <template #default="scope">
+            {{scope.row.totalPurchasePrice > 0 ? '+' : ''}}{{ scope.row.totalPurchasePrice }}元
+          </template>
+        </el-table-column>
+        <el-table-column label="盈亏金额(售价)" prop="totalSalePrice" width="200">
+          <template #default="scope">
+            {{scope.row.totalSalePrice > 0 ? '+' : ''}}{{ scope.row.totalSalePrice }}元
+          </template>
+        </el-table-column>
+        <el-table-column label="领用人" prop="applyUserName" width="100">
+          <template #default="scope">
+            {{ scope.row.applyUserName }}
+          </template>
+        </el-table-column>
         <el-table-column prop="createDatetime" label="创建时间" width="300">
           <template #default="scope">
             {{ formatDate(scope.row.createDatetime) }}

src/views/inventory/check.vue

@@ -36,7 +36,36 @@
         <el-table :data="tableData" @cell-click="editCheck" style="height: 100%" :header-cell-style="{ backgroundColor: '#F1F5FB' }">
           <el-table-column label="订单号" prop="code" width="250">
           </el-table-column>
-          <el-table-column label="状态" prop="state" width="250"></el-table-column>
+          <el-table-column label="状态" prop="state" width="250">
+            <template #default="scope">
+              {{ scope.row.state == 1 ? '已完成' : scope.row.state == 0 ? '进行中' : '未知' }}
+            </template>
+          </el-table-column>
+          <el-table-column label="品种" prop="kindCount" width="100">
+            <template #default="scope">
+              {{ scope.row.kindCount }}种
+            </template>
+          </el-table-column>
+          <el-table-column label="盈亏数量" prop="changeTotalWholeCount" width="100">
+            <template #default="scope">
+              {{scope.row.changeTotalWholeCount > 0 ? '+' : ''}}{{ scope.row.changeTotalWholeCount }}
+            </template>
+          </el-table-column>
+          <el-table-column label="盈亏金额(进价)" prop="totalPurchasePrice" width="200">
+            <template #default="scope">
+              {{scope.row.totalPurchasePrice > 0 ? '+' : ''}}{{ scope.row.totalPurchasePrice }}元
+            </template>
+          </el-table-column>
+          <el-table-column label="盈亏金额(售价)" prop="totalSalePrice" width="200">
+            <template #default="scope">
+              {{scope.row.totalSalePrice > 0 ? '+' : ''}}{{ scope.row.totalSalePrice }}元
+            </template>
+          </el-table-column>
+          <el-table-column label="盘点人" prop="checkUserName" width="100">
+            <template #default="scope">
+              {{ scope.row.checkUserName }}
+            </template>
+          </el-table-column>
           <el-table-column label="创建时间" prop="createDatetime" width="250">
             <template #default="scope">
               {{ formatDate(scope.row.createDatetime) }}