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

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

@@ -42,11 +42,11 @@
 				<el-table-column prop="ddDate" label="单据日期" show-overflow-tooltip />
 				<el-table-column prop="productName" label="商品信息" show-overflow-tooltip />
 				<el-table-column prop="handlerUserName" label="经办人" show-overflow-tooltip />
-				<!--				<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>-->
-				<!--					<template #default="scope">-->
-				<!--						<dict-tag :options="check_status" :value="scope.row.checkStatus" />-->
-				<!--					</template>-->
-				<!--				</el-table-column>-->
+								<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>
+									<template #default="scope">
+										<dict-tag :options="check_status" :value="scope.row.checkStatus" />
+									</template>
+								</el-table-column>
 				<!-- <el-table-column prop="totalAmount" label="金额合计" show-overflow-tooltip /> -->
 				<el-table-column prop="supplierId" label="货商" show-overflow-tooltip />
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip />

src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue

@@ -22,11 +22,6 @@
 					<el-form-item label="经办人" prop="handlerUserId">
 						<SelectHandlerUser v-model.trim="baseDataForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
 					</el-form-item>
-					<el-form-item label="审批状态" prop="checkStatus">
-						<el-select v-model="baseDataForm.checkStatus" placeholder="请选择审批状态" style="width: 200px">
-							<el-option :label="item.label" :value="item.value" v-for="(item, index) in check_status" :key="index" />
-						</el-select>
-					</el-form-item>
 					<el-form-item label="货商" prop="supplierId">
 						<select-supplier v-model="baseDataForm.supplierId" style="width: 200px" />
 					</el-form-item>