فهرست منبع

feat:收发明细型号,客户,出入库型号

liujt 1 ماه پیش
والد
کامیت
0372800fcf

+ 12 - 1
src/views/warehouseManagement/outgoingManagement/index.vue

@@ -134,6 +134,16 @@
               ></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelType">
+              <el-input
+                size="small"
+                class="w100"
+                placeholder="请输入"
+                v-model="formData.modelType"
+              ></el-input>
+            </el-form-item>
+          </el-col>
           <el-col
             style="
               display: flex;
@@ -351,7 +361,8 @@
           factoryId: '',
           time: [],
           warehouseId: '',
-          colorKey: ''
+          colorKey: '',
+          modelType: ''
         },
         total: 0,
         status: [

+ 37 - 14
src/views/warehouseManagement/statisticalReports/transceiverDetails/add.vue

@@ -18,8 +18,8 @@
           @submit.native.prevent
         >
           <el-row :gutter="15">
-            <el-col :span="5">
-              <el-form-item label-width="60px" label="编码:" prop="code">
+            <el-col :span="6">
+              <el-form-item label-width="90px" label="编码:" prop="code">
                 <el-input
                   disabled
                   v-model="formData.code"
@@ -27,8 +27,8 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
-              <el-form-item label-width="60px" label="名称:" prop="name">
+            <el-col :span="6">
+              <el-form-item label-width="90px" label="名称:" prop="name">
                 <el-input
                   :disabled="isView"
                   v-model="formData.name"
@@ -36,7 +36,7 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="7">
+            <el-col :span="6">
               <el-form-item label-width="90px" label="起止时间:" prop="time">
                 <el-date-picker
                   :disabled="isView"
@@ -53,8 +53,8 @@
                 ></el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item label-width="60px" label="关键词:" prop="keyWord">
+            <el-col :span="6">
+              <el-form-item label-width="90px" label="关键词:" prop="keyWord">
                 <el-input
                   :disabled="isView"
                   v-model="formData.keyWord"
@@ -62,8 +62,8 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
-              <el-form-item label-width="60px" label="出入库:" prop="type">
+            <el-col :span="6">
+              <el-form-item label-width="90px" label="出入库:" prop="type">
                 <el-select
                   filterable
                   placeholder="请选择"
@@ -81,8 +81,8 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
-              <el-form-item :label="formData.type == 2 ? '出库类型:' : '入库类型:'" prop="bizType">
+            <el-col :span="6">
+              <el-form-item label-width="90px" :label="formData.type == 2 ? '出库类型:' : '入库类型:'" prop="bizType">
                 <el-select
                   filterable
                   placeholder="请选择"
@@ -99,8 +99,8 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
-              <el-form-item label="物品类型" prop="categoryLevelId">
+            <el-col :span="6">
+              <el-form-item label-width="90px" label="物品类型:" prop="categoryLevelId">
                 <el-select
                   filterable
                   placeholder="请选择"
@@ -117,7 +117,16 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col v-if="!isView" :span="3">
+            <!-- <el-col :span="6">
+              <el-form-item label-width="90px" label="型号:" prop="categoryModel">
+                <el-input
+                  :disabled="isView"
+                  v-model="formData.categoryModel"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col> -->
+            <el-col v-if="!isView" :span="6">
               <div class="ele-form-actions">
                 <el-button
                   type="primary"
@@ -348,6 +357,20 @@
             showOverflowTooltip: true,
             width: 120
           },
+          {
+            prop: 'categoryModel',
+            label: '型号',
+            align: 'center',
+            showOverflowTooltip: true,
+            width: 120
+          },
+          {
+            prop: 'clientUser',
+            label: '客户',
+            align: 'center',
+            showOverflowTooltip: true,
+            width: 120
+          },
           {
             prop: 'totalQuantity',
             label: '数量',

+ 13 - 1
src/views/warehouseManagement/stockManagement/index.vue

@@ -139,6 +139,16 @@
               ></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelType">
+              <el-input
+                size="small"
+                class="w100"
+                placeholder="请输入"
+                v-model="formData.modelType"
+              ></el-input>
+            </el-form-item>
+          </el-col>
           <el-col
             style="
               display: flex;
@@ -338,7 +348,9 @@
           status: '',
           factoryId: '',
           time: [],
-          warehouseId: ''
+          warehouseId: '',
+          colorKey: '',
+          modelType: '',
           // type: 1
         },
         loading: false,