Merge remote-tracking branch 'origin/master'

src/views/business/supplier/form.vue

@@ -1,32 +1,16 @@
 <template>
-  <el-dialog
-    title="供应商信息"
-    height="400px"
-    v-model="visible"
-    width="500px"
-    append-to-body
-    draggable
-  >
+  <el-dialog title="外协厂信息" height="400px" v-model="visible" width="500px" append-to-body draggable>
     <div class="form-container">
       <!-- 主表 -->
-      <el-form
-        ref="formRef"
-        class="master-container"
-        :model="form"
-        :rules="rules"
-        label-width="120px"
-      >
-        <el-form-item label="供应商名称" prop="name">
-          <el-input v-model.trim="form.name" placeholder="请输入供应商名称" />
+      <el-form ref="formRef" class="master-container" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="外协厂名称" prop="name">
+          <el-input v-model.trim="form.name" placeholder="请输入外协厂名称" />
         </el-form-item>
-        <el-form-item label="供应商编码">
-          <el-input v-model.trim="form.code" placeholder="请输入助记码" />
+        <el-form-item label="外协厂编码" prop="code">
+          <el-input v-model.trim="form.code" placeholder="请输入外协厂编码" />
         </el-form-item>
         <el-form-item label="助记码" prop="mnemonicCode">
-          <el-input
-            v-model.trim="form.mnemonicCode"
-            placeholder="请输入助记码"
-          />
+          <el-input v-model.trim="form.mnemonicCode" placeholder="请输入助记码" />
         </el-form-item>
         <el-form-item label="外协单价" prop="freightPrice">
               <el-input-number
@@ -38,33 +22,17 @@
             </el-form-item>
         <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-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-select v-model="form.settlementType" placeholder="请选择结算方式">
-            <el-option
-              v-for="dict in settlementType"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
+            <el-option v-for="dict in settlementType" :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="损耗上限(%)" prop="lossLimit">
-          <el-input-number
-            v-model="form.lossLimit"
-            :min="0"
-            :max="100"
-            :precision="2"
-            controls-position="right"
-            placeholder="请输入损耗上限(%)"
-          />
+          <el-input-number v-model="form.lossLimit" :min="0" :max="100" :precision="2" controls-position="right"
+            placeholder="请输入损耗上限(%)" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model.trim="form.remark" placeholder="请输入备注" />
@@ -72,9 +40,7 @@
       </el-form>
     </div>
     <template #footer>
-      <el-button type="primary" icon="Check" @click="handleSave"
-        >确 定</el-button
-      >
+      <el-button type="primary" icon="Check" @click="handleSave">确 定</el-button>
       <el-button icon="Close" @click="handleCancel">取 消</el-button>
     </template>
   </el-dialog>
@@ -100,6 +66,7 @@ const data = reactive({
   form: {},
   rules: {
     name: [{ required: true, message: "供应商名称不能为空", trigger: "blur" }],
+    code: [{ required: true, message: "供应商编码不能为空", trigger: "blur" }],
     mnemonicCode: [
       { required: true, message: "助记码不能为空", trigger: "blur" },
     ],