Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud

src/views/supermarketerp/components/linkCodeDialog.vue

@@ -51,9 +51,21 @@
 			<vxe-column type="checkbox" width="60" align="center"></vxe-column>
 			<vxe-column field="unit" title="包装单位" align="center" width="200"></vxe-column>
 			<vxe-column field="quantity" title="数量" align="center" width="100"></vxe-column>
-			<vxe-column field="purchasePrice" title="进价" align="center" width="100"></vxe-column>
-			<vxe-column field="unitPrice" title="单价" align="center" width="100"></vxe-column>
-			<vxe-column field="totalAmount" title="累计总金额" align="center" width="100"></vxe-column>
+			<vxe-column field="purchasePrice" title="进价" align="center" width="100">
+				<template #default="{ row }">
+					{{ displayPrice(row.purchasePrice) }}
+				</template>
+			</vxe-column>
+			<vxe-column field="unitPrice" title="单价" align="center" width="100">
+				<template #default="{ row }">
+					{{ displayPrice(row.unitPrice) }}
+				</template>
+			</vxe-column>
+			<vxe-column field="totalAmount" title="累计总金额" align="center" width="100">
+				<template #default="{ row }">
+					{{ displayPrice(row.totalAmount) }}
+				</template>
+			</vxe-column>
 			<vxe-column field="remark" title="备注" show-overflow align="center" min-width="100"></vxe-column>
 		</vxe-table>
 
@@ -71,6 +83,7 @@ import { ref } from "vue"
 import { VxeTableEvents } from "vxe-table"
 import { getSimpleUserAll } from "/@/api/admin/user"
 import { useDict } from "/@/hooks/dict"
+import { displayPrice } from "/@/utils/formatMoney"
 
 const { check_status } = useDict("check_status")
 const linkCodeDialogVisible = defineModel()

src/views/supermarketerp/purchaseManagement/smErpCgBack/index.vue

@@ -75,12 +75,20 @@
 						<dict-tag :options="check_status" :value="row.checkStatus" />
 					</template>
 				</el-table-column>
-				<el-table-column prop="supplierId" label="货商" show-overflow-tooltip />
+				<el-table-column prop="supplierName" label="货商" show-overflow-tooltip />
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
 				<!--				<el-table-column prop="totalAmount" label="入库总金额" show-overflow-tooltip />-->
 				<el-table-column label="操作" width="150">
 					<template #default="scope">
-						<el-button v-if="scope.row.checkStatus == '2'" icon="MessageBox" text type="success" @click="edit(scope.row)">详情</el-button>
+						<el-button
+							v-if="scope.row.checkStatus == '2' || scope.row.checkStatus == '3'"
+							icon="MessageBox"
+							text
+							type="success"
+							@click="edit(scope.row)"
+						>
+							详情
+						</el-button>
 						<el-button
 							v-else
 							icon="edit-pen"
@@ -100,7 +108,14 @@
 						>
 							删除
 						</el-button>
-						<el-button type="primary" size="small" v-if="scope.row.checkStatus != '2'" link icon="VideoPlay" @click="deal(scope.row)">
+						<el-button
+							type="primary"
+							size="small"
+							v-if="scope.row.checkStatus == '1' && scope.row.taskId"
+							link
+							icon="VideoPlay"
+							@click="deal(scope.row)"
+						>
 							开始处理
 						</el-button>
 					</template>

src/views/supermarketerp/purchaseManagement/smErpCgDd/index.vue

@@ -50,14 +50,29 @@
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
 				<el-table-column label="操作" width="150">
 					<template #default="scope">
-						<el-button v-if="scope.row.checkStatus == '2'" icon="MessageBox" text type="success" @click="edit(scope.row)">详情</el-button>
+						<el-button
+							v-if="scope.row.checkStatus == '2' || scope.row.checkStatus == '3'"
+							icon="MessageBox"
+							text
+							type="success"
+							@click="edit(scope.row)"
+						>
+							详情
+						</el-button>
 						<el-button v-else icon="edit-pen" text type="primary" v-auth="'supermarket_smErpCgDd_edit'" @click="edit(scope.row)">
 							编辑
 						</el-button>
 						<el-button icon="delete" text type="primary" v-auth="'supermarket_smErpCgDd_del'" @click="handleDelete([scope.row.id])">
 							删除
 						</el-button>
-						<el-button type="primary" size="small" v-if="scope.row.checkStatus != '2'" link icon="VideoPlay" @click="deal(scope.row)">
+						<el-button
+							type="primary"
+							size="small"
+							v-if="scope.row.checkStatus != '2' && scope.row.taskId"
+							link
+							icon="VideoPlay"
+							@click="deal(scope.row)"
+						>
 							开始处理
 						</el-button>
 					</template>

src/views/supermarketerp/retailManagement/smErpRetailBack/index.vue

@@ -80,7 +80,15 @@
 				<el-table-column prop="totalAmount" label="入库总金额" show-overflow-tooltip />
 				<el-table-column label="操作" width="150">
 					<template #default="scope">
-						<el-button v-if="scope.row.checkStatus == '2'" icon="MessageBox" text type="success" @click="edit(scope.row)">详情</el-button>
+						<el-button
+							v-if="scope.row.checkStatus == '2' || scope.row.checkStatus == '3'"
+							icon="MessageBox"
+							text
+							type="success"
+							@click="edit(scope.row)"
+						>
+							详情
+						</el-button>
 						<el-button
 							v-else
 							icon="edit-pen"
@@ -100,7 +108,14 @@
 						>
 							删除
 						</el-button>
-						<el-button type="primary" size="small" v-if="scope.row.checkStatus != '2'" link icon="VideoPlay" @click="deal(scope.row)">
+						<el-button
+							type="primary"
+							size="small"
+							v-if="scope.row.checkStatus == '1' && scope.row.taskId"
+							link
+							icon="VideoPlay"
+							@click="deal(scope.row)"
+						>
 							开始处理
 						</el-button>
 					</template>

src/views/supermarketerp/retailManagement/smErpRetailDelivery/index.vue

@@ -80,7 +80,15 @@
 				<el-table-column prop="totalAmount" label="入库总金额" show-overflow-tooltip />
 				<el-table-column label="操作" width="150">
 					<template #default="scope">
-						<el-button v-if="scope.row.checkStatus == '2'" icon="MessageBox" text type="success" @click="edit(scope.row)">详情</el-button>
+						<el-button
+							v-if="scope.row.checkStatus == '2' || scope.row.checkStatus == '3'"
+							icon="MessageBox"
+							text
+							type="success"
+							@click="edit(scope.row)"
+						>
+							详情
+						</el-button>
 						<el-button
 							v-else
 							icon="edit-pen"
@@ -100,7 +108,14 @@
 						>
 							删除
 						</el-button>
-						<el-button type="primary" size="small" v-if="scope.row.checkStatus != '2'" link icon="VideoPlay" @click="deal(scope.row)">
+						<el-button
+							type="primary"
+							size="small"
+							v-if="scope.row.checkStatus == '1' && scope.row.taskId"
+							link
+							icon="VideoPlay"
+							@click="deal(scope.row)"
+						>
 							开始处理
 						</el-button>
 					</template>

src/views/supermarketerp/stockTaking/index.vue

@@ -68,10 +68,25 @@
 				<!-- <el-table-column prop="totalAmount" label="入库总金额" show-overflow-tooltip /> -->
 				<el-table-column label="操作" width="150">
 					<template #default="scope">
-						<el-button v-if="scope.row.checkStatus == '2'" icon="MessageBox" text type="success" @click="edit(scope.row)">详情</el-button>
+						<el-button
+							v-if="scope.row.checkStatus == '2' || scope.row.checkStatus == '3'"
+							icon="MessageBox"
+							text
+							type="success"
+							@click="edit(scope.row)"
+						>
+							详情
+						</el-button>
 						<el-button v-else icon="edit-pen" text type="primary" @click="edit(scope.row)">编辑</el-button>
 						<el-button icon="delete" text type="primary" @click="handleDelete([scope.row.id])">删除</el-button>
-						<el-button type="primary" size="small" v-if="scope.row.checkStatus != '2'" link icon="VideoPlay" @click="deal(scope.row)">
+						<el-button
+							type="primary"
+							size="small"
+							v-if="scope.row.checkStatus == '1' && scope.row.taskId"
+							link
+							icon="VideoPlay"
+							@click="deal(scope.row)"
+						>
 							开始处理
 						</el-button>
 					</template>