0515

src/views/business/outsource/index.vue

@@ -188,7 +188,7 @@
                 type="warning"
                 icon="Edit"
                 @click="handleUpdate(scope.row)"
-                v-hasPermi="['business:outsource:save']"
+                v-hasPermi="['business:outsource:edit']"
               >
                 编辑
               </el-button>
@@ -198,7 +198,7 @@
                 type="primary"
                 icon="View"
                 @click="handleUpdate(scope.row)"
-                v-hasPermi="['business:outsource:save']"
+                v-hasPermi="['business:outsource:query']"
               >
                 查看
               </el-button>

src/views/business/returnReceipt/form.vue

@@ -7,7 +7,7 @@
 					<span>收回单信息</span>
 				</span>
 				<el-button-group>
-					<el-button type="primary" icon="Finished" @click="submitForm"> 保存 </el-button>
+					<el-button type="primary" icon="Finished" @click="submitForm"> 确认收回 </el-button>
 				</el-button-group>
 
 				<div class="close-btn" @click="cancel">

src/views/business/returnReceipt/index.vue

@@ -92,6 +92,19 @@
               {{ parseTime(scope.row.formDate, "{y}-{m}-{d}") }}
             </template>
           </el-table-column>
+		  <el-table-column
+              label="状态"
+              width="80"
+              prop="status"
+              align="center"
+            >
+              <template #default="scope">
+                <dict-tag
+                  :options="is_audit_num"
+                  :value="scope.row.status"
+                />
+              </template>
+            </el-table-column>
           <el-table-column label="备注" align="center" prop="remark" />
           <el-table-column
             label="操作"
@@ -132,7 +145,8 @@
 import { listReceipt, delReceipt } from "@/api/business/returnReceipt";
 import receiptForm from "./form";
 const { proxy } = getCurrentInstance();
-
+/** 字典数组区 */
+const { is_audit_num } = proxy.useDict("is_audit_num");
 const dataList = ref([]);
 const loading = ref(true);
 const multiple = ref(false);

src/views/business/supplier/contactsForm.vue

@@ -80,10 +80,10 @@
               />
             </template>
           </el-table-column>
-          <el-table-column label="邮箱" prop="eamil" align="center">
+          <el-table-column label="邮箱" prop="email" align="center">
             <template #default="scope">
               <el-input
-                v-model.trim="scope.row.eamil"
+                v-model.trim="scope.row.email"
                 placeholder="请输入邮箱"
               />
             </template>

src/views/business/supplier/form.vue

@@ -9,12 +9,12 @@
 				<el-form-item label="助记码" prop="mnemonicCode">
 					<el-input v-model.trim="form.mnemonicCode" placeholder="请输入助记码" />
 				</el-form-item>
-				<el-form-item label="发货方式" prop="deliveryMethod">
+				<el-form-item label="默认发货方式" prop="deliveryMethod">
 					<el-select v-model="form.deliveryMethod" placeholder="请选择发货方式">
 						<el-option v-for="dict in deliveryMethod" :key="dict.value" :label="dict.label" :value="dict.value" />
 					</el-select>
 				</el-form-item>
-				<el-form-item label="结算方式" prop="settlementType">
+				<el-form-item label="默认结算方式" prop="settlementType">
 					<el-select v-model="form.settlementType" placeholder="请选择结算方式">
 						<el-option v-for="dict in settlementType" :key="dict.value" :label="dict.label" :value="dict.value" />
 					</el-select>

src/views/business/supplier/index.vue

@@ -413,6 +413,9 @@ const getCurrentSupplierProduct = () => {
 		if (supplierProductList.value.length > 0) {
 			currentProduct.value = supplierProductList.value[0]
 			proxy.$refs.productTable.setCurrentRow(supplierProductList.value[0])
+		}else{
+			supplierProductProcessList.value = []
+			currentProduct.value = {}
 		}
 		supplierProductLoading.value = false
 	})