Merge remote-tracking branch 'origin/master'

src/views/wms/bpprocure/index.vue

@@ -91,7 +91,8 @@
       <el-table-column label="已入库数量" align="center" prop="realityNumber" />
       <el-table-column label="单位" align="center" prop="unit" />
       <el-table-column label="单价" align="center" prop="price" />
-
+      <el-table-column label="订单来源" align="center" prop="attr2" />
+      <el-table-column label="申请人" align="center" prop="attr3" />
       <el-table-column label="计划时间" align="center" prop="attr1" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.attr1, '{y}-{m}-{d}') }}</span>
@@ -135,7 +136,6 @@
 <!--        <el-form-item label="物料编码" prop="materialCode">-->
 <!--          <el-input v-model="form.materialCode" placeholder="请输入物料编码" />-->
 <!--        </el-form-item>-->
-
         <el-form-item label="物料名称" prop="materialName" :rules="[{ required: true, message: '请选择物料名称', trigger: 'change' }]">
           <el-select v-model="form.materialName" placeholder="请选择物料" clearable>
             <el-option
@@ -148,9 +148,24 @@
         </el-form-item>
 
 
-        <el-form-item label="供应商" prop="supplyName">
-          <el-input v-model="form.supplyName" placeholder="请输入供应商" />
+<!--        <el-form-item label="供应商" prop="supplyName">-->
+<!--          <el-input v-model="form.supplyName" placeholder="请输入供应商" />-->
+<!--        </el-form-item>-->
+
+        <el-form-item label="供应商" prop="supplyName" :rules="[{ required: true, message: '请选择供应商', trigger: 'change' }]">
+          <el-select v-model="form.supplyName" placeholder="请选择供应商" clearable>
+            <el-option
+              v-for="dict in dict.type.bp_supplier"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
         </el-form-item>
+
+
+
+
         <el-form-item label="计划数量" prop="planNumber">
           <el-input v-model="form.planNumber" placeholder="请输入计划数量" />
         </el-form-item>
@@ -163,9 +178,6 @@
         <el-form-item label="单价" prop="price">
           <el-input v-model="form.price" placeholder="请输入价格" />
         </el-form-item>
-<!--        <el-form-item label="用户自定义1" prop="attr1">-->
-<!--          <el-input v-model="form.attr1" placeholder="请输入用户自定义1" />-->
-<!--        </el-form-item>-->
 
 
         <el-form-item label="计划时间" prop="attr1">
@@ -180,9 +192,25 @@
 <!--        <el-form-item label="用户自定义2" prop="attr2">-->
 <!--          <el-input v-model="form.attr2" placeholder="请输入用户自定义2" />-->
 <!--        </el-form-item>-->
-<!--        <el-form-item label="用户自定义3" prop="attr3">-->
-<!--          <el-input v-model="form.attr3" placeholder="请输入用户自定义3" />-->
-<!--        </el-form-item>-->
+
+        <el-form-item label="订单来源" prop="attr2" :rules="[{ required: true, message: '请选择订单来源', trigger: 'change' }]">
+          <el-select v-model="form.attr2" placeholder="请选择订单来源" clearable>
+            <el-option
+              v-for="dict in dict.type.bp_osource"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+
+
+
+
+
+        <el-form-item label="申请人" prop="attr3">
+          <el-input v-model="form.attr3" placeholder="请输入申请人" />
+        </el-form-item>
 <!--        <el-form-item label="用户自定义4" prop="attr4">-->
 <!--          <el-input v-model="form.attr4" placeholder="请输入用户自定义4" />-->
 <!--        </el-form-item>-->
@@ -203,7 +231,7 @@ import { listBpprocure, getBpprocure, delBpprocure, addBpprocure, updateBpprocur
 import JsBarcode from 'jsbarcode';
 export default {
   name: "Bpprocure",
-  dicts: ['bp_raw'],
+  dicts: ['bp_raw','bp_supplier','bp_osource'],
   data() {
     return {
       // 遮罩层

src/views/wms/raw/index.vue

@@ -201,8 +201,8 @@
 <!--      <el-table-column label="供应商" align="center" prop="supplyName" />-->
 <!--      <el-table-column label="计划数量" align="center" prop="amnountPlan" />-->
       <el-table-column label="库存数量" align="center" prop="amountReal" />
-<!--      <el-table-column label="备用" align="center" prop="userDefined1" />-->
-<!--      <el-table-column label="备用" align="center" prop="userDefined2" />-->
+      <el-table-column label="安全库存" align="center" prop="userDefined1" />
+      <el-table-column label="需求库存" align="center" prop="userDefined2" />
 <!--      <el-table-column label="备用" align="center" prop="userDefined3" />-->
 <!--      <el-table-column label="备用" align="center" prop="userDefined4" />-->
 <!--      <el-table-column label="备用" align="center" prop="userDefined5" />-->
@@ -217,24 +217,24 @@
 <!--          <span>{{ parseTime(scope.row.gmtModified, '{y}-{m}-{d}') }}</span>-->
 <!--        </template>-->
 <!--      </el-table-column>-->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['wms:raw:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['wms:raw:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleUpdate(scope.row)"-->
+<!--            v-hasPermi="['wms:raw:edit']"-->
+<!--          >修改</el-button>-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['wms:raw:remove']"-->
+<!--          >删除</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
 
     <pagination