安全库存-字段调整

src/views/production/safetyStock/modules/safetyStockListAdd.vue

@@ -13,43 +13,29 @@
             <a-form-model layout="inline" :model="form" :rules="rules"  ref="form">
               <a-row :gutter="24">
                 <a-col :md="8" :sm="24">
-                  <a-form-model-item label="存货编码"  prop='inventoryCode' :labelCol="{offset: 1}">
+                  <a-form-model-item label="料品编码"  prop='inventoryCode' :labelCol="{offset: 1}">
                     <a-input-search placeholder="请输入" v-model="form.inventoryCode" @search="onSearchInvebtory" readOnly></a-input-search>
                   </a-form-model-item>
                 </a-col>
-                <a-col :md="8" :sm="24" >
-                    <a-form-model-item label="定尺" name='fixedLength' >
-                        <a-input-search placeholder="请输入" v-model="form.fixedLength" @search="onSearch" readOnly></a-input-search>
-                    </a-form-model-item>
-                  </a-col>
-                <a-col :md="8" :sm="24">
-                    <a-form-model-item label="颜色" name='color' :labelCol="{offset: 1}">
-                        <a-input-search placeholder="请输入" v-model="form.color" @search="onSearch" readOnly></a-input-search>
-                    </a-form-model-item>
-                  </a-col>
-                  <a-col  :md="8" :sm="24">
-                  <a-form-model-item label="存货名称" name='inventoryName' :labelCol="{offset: 2}">
+                <a-col  :md="8" :sm="24">
+                  <a-form-model-item label="料品名称" name='inventoryName' >
                     <a-input placeholder="请输入" v-model="form.inventoryName" disabled ></a-input>
                   </a-form-model-item>
                 </a-col>
-                  <a-col :md="8" :sm="24">
-                    <a-form-model-item label="合金" name='alloy'>
-                      <a-input-search placeholder="请输入" v-model="form.alloy" @search="onSearch" readOnly></a-input-search>
+                <a-col :md="8" :sm="24">
+                    <a-form-model-item label="型号" name='model' :labelCol="{offset: 1}">
+                      <a-input placeholder="请输入" v-model="form.model"></a-input>
                     </a-form-model-item>
                   </a-col>
-                  <a-col :md="8" :sm="24">
-                    <a-form-model-item label="标准" name='standard' :labelCol="{offset: 1}">
-                    <a-input-search placeholder="请输入" v-model="form.standard" @search="onSearch" readOnly></a-input-search>
-                  </a-form-model-item>
-                  </a-col>
                   <a-col :md="8" :sm="24">
                     <a-form-model-item label="安全库存" name='safetyStock' :labelCol="{offset: 2}">
                       <a-input-number  :default-value="0"  v-model="form.safetyStock"/>
                     </a-form-model-item>
                   </a-col>
-                  <a-col :md="8" :sm="24">
-                    <a-form-model-item label="型号" name='model'>
-                      <a-input placeholder="请输入" v-model="form.model" disabled></a-input>
+                  
+                  <a-col :md="8" :sm="24" >
+                    <a-form-model-item label="料品属性" name='fixedLength' >
+                        <a-input placeholder="请输入" v-model="form.attribute" />
                     </a-form-model-item>
                   </a-col>
                   <a-col :md="8" :sm="24">
@@ -57,56 +43,6 @@
                       <a-input placeholder="请输入" v-model="form.specs" disabled></a-input>
                     </a-form-model-item>
                   </a-col>
-                  
-                  <a-col :md="8" :sm="24">
-                    <a-form-model-item label="最高库存" name='maxStock' :labelCol="{offset: 2}">
-                      <a-input-number  :default-value="0"  v-model="form.maxStock"/>
-                    </a-form-model-item>
-                  </a-col>
-                  <a-col :md="8" :sm="24">
-                    <a-form-model-item label="米重" name='meterWeight'>
-                        <a-input placeholder="请输入" v-model="form.meterWeight" disabled></a-input>
-                    </a-form-model-item>
-                  </a-col> 
-                  <a-col :md="8" :sm="24">
-                    <a-form-model-item label="辅单位" name='auxiliaryUnit'>
-                      <a-input placeholder="请输入" v-model="form.auxiliaryUnit" disabled></a-input>
-                    </a-form-model-item>
-                  </a-col>
-                  <a-col :md="8" :sm="24">
-                    <a-form-model-item label="装饰面周长" name='decorationLength' :labelCol="{offset: 1}">
-                        <a-input placeholder="请输入" v-model="form.decorationLength" disabled></a-input>
-                    </a-form-model-item>
-                  </a-col> 
-                  <a-col :md="8" :sm="24">
-                    <a-form-model-item label="窗号" name='windowNo'>
-                        <a-input placeholder="请输入" v-model="form.windowNo" disabled></a-input>
-                    </a-form-model-item>
-                  </a-col>  
-                  <a-col :md="8" :sm="24">
-                    <a-form-model-item label="起订点" name='startingPoint'>
-                      <a-input-number  :default-value="0"  v-model="form.startingPoint"/>
-                    </a-form-model-item>
-                  </a-col>
-                  
-                  <a-col :md="8" :sm="24">
-                    <a-form-model-item label="按辅计量计算" name='isAuxiliaryUnit'>
-                      <a-select v-model="form.isAuxiliaryUnit"  style='width:100%' >
-                                <a-select-option value='是'> 是</a-select-option>
-                                <a-select-option value='否'> 否</a-select-option>
-                      </a-select>
-                    </a-form-model-item>
-                  </a-col>
-                  <a-col :md="8" :sm="24">
-                    <a-form-model-item label="单位" name='unit'>
-                        <a-input placeholder="请输入" v-model="form.unit" disabled></a-input>
-                    </a-form-model-item>
-                  </a-col>
-                  <a-col :md="8" :sm="24">
-                    <a-form-model-item label="专用区" name='exclusiveZone'>
-                        <a-input placeholder="请输入" v-model="form.exclusiveZone" disabled></a-input>
-                    </a-form-model-item>
-                  </a-col>    
               </a-row>
             </a-form-model>
         </div>
@@ -197,8 +133,6 @@
               this.$set(this.form,'inventoryCode',data.Code)
               this.$set(this.form,'inventoryName',data.Name)
               this.$set(this.form,'specs',data.SPECS)
-              this.$set(this.form,'unit',data.unit)
-              this.$set(this.form,'auxiliaryUnit',data.auxiliaryUnit )
               this.$set(this.form,'inventory',data.ID )
             },
             onSearch(){

src/views/production/safetyStock/modules/safetyStockListDetail.vue

@@ -15,41 +15,16 @@
             <a-form layout="inline" @keyup.enter.native="searchQuery">
               <a-row :gutter="24">
                 <a-col :md="8" :sm="24">
-                  <a-form-item label="存货编码" prop='inventoryCode'>
+                  <a-form-item label="料品编码" prop='inventoryCode'>
                     <a-input-search placeholder="请输入" v-model="form.inventoryCode" disabled></a-input-search>
                   </a-form-item>
                 </a-col>
                 <a-col  :md="8" :sm="24">
-                  <a-form-item label="存货名称" prop='inventoryName'>
+                  <a-form-item label="料品名称" prop='inventoryName'>
                     <a-input placeholder="请输入" v-model="form.inventoryName" disabled></a-input>
                   </a-form-item>
                 </a-col>
                 <a-col :md="8" :sm="24">
-                    <a-form-item label="颜色" prop='color'>
-                        <a-input-search placeholder="请输入" v-model="form.color"  disabled></a-input-search>
-                    </a-form-item>
-                  </a-col>
-                  <a-col :md="8" :sm="24" >
-                    <a-form-item label="定尺" prop='fixedLength'>
-                        <a-input-search placeholder="请输入" v-model="form.fixedLength" disabled></a-input-search>
-                    </a-form-item>
-                  </a-col>
-                  <a-col :md="8" :sm="24">
-                    <a-form-item label="合金" prop='alloy'>
-                      <a-input-search placeholder="请输入" v-model="form.alloy" disabled></a-input-search>
-                    </a-form-item>
-                  </a-col>
-                  <a-col :md="8" :sm="24">
-                    <a-form-item label="标准" prop='standard'>
-                    <a-input-search placeholder="请输入" v-model="form.standard" disabled></a-input-search>
-                  </a-form-item>
-                  </a-col>
-                  <a-col :md="8" :sm="24">
-                    <a-form-item label="规格" prop='model'>
-                      <a-input placeholder="请输入" v-model="form.specs" disabled></a-input>
-                    </a-form-item>
-                  </a-col>
-                  <a-col :md="8" :sm="24">
                     <a-form-item label="型号" prop='model'>
                       <a-input-search placeholder="请输入" v-model="form.model" disabled></a-input-search>
                     </a-form-item>
@@ -60,53 +35,15 @@
                     </a-form-item>
                   </a-col>
                   <a-col :md="8" :sm="24">
-                    <a-form-item label="最高库存" prop='maxStock'>
-                      <a-input-number  :default-value="0"  v-model="form.maxStock" disabled/>
-                    </a-form-item>
-                  </a-col>
-                  <a-col :md="8" :sm="24">
-                    <a-form-item label="起订点" prop='startingPoint'>
-                      <a-input-number  :default-value="0"  v-model="form.startingPoint" disabled/>
-                    </a-form-item>
-                  </a-col>
-                  <a-col :md="8" :sm="24">
-                    <a-form-item label="辅单位" prop='auxiliaryUnit'>
-                      <a-input placeholder="请输入" v-model="form.auxiliaryUnit" disabled></a-input>
+                    <a-form-item label="规格" prop='model'>
+                      <a-input placeholder="请输入" v-model="form.specs" disabled></a-input>
                     </a-form-item>
                   </a-col>
-                  <a-col :md="8" :sm="24">
-                    <a-form-item label="单位" prop='unit'>
-                        <a-input placeholder="请输入" v-model="form.unit" disabled></a-input>
-                    </a-form-item>
+                  <a-col :md="8" :sm="24" >
+                    <a-form-model-item label="料品属性" name='fixedLength' >
+                        <a-input placeholder="请输入" v-model="form.attribute" disabled/>
+                    </a-form-model-item>
                   </a-col>
-                  <a-col :md="8" :sm="24">
-                    <a-form-item label="按辅计量计算" prop='isAuxiliaryUnit'>
-                      <a-select v-model="form.isAuxiliaryUnit"  style='width:100%' disabled>
-                                <a-select-option value='是'> 是</a-select-option>
-                                <a-select-option value='否'> 否</a-select-option>
-                      </a-select>
-                    </a-form-item>
-                  </a-col>  
-                  <a-col :md="8" :sm="24">
-                    <a-form-item label="米重" prop='meterWeight'>
-                        <a-input placeholder="请输入" v-model="form.meterWeight" disabled></a-input>
-                    </a-form-item>
-                  </a-col> 
-                  <a-col :md="8" :sm="24">
-                    <a-form-item label="窗号" prop='windowNo'>
-                        <a-input placeholder="请输入" v-model="form.windowNo" disabled></a-input>
-                    </a-form-item>
-                  </a-col>  
-                  <a-col :md="8" :sm="24">
-                    <a-form-item label="装饰面周长" prop='decorationLength'>
-                        <a-input placeholder="请输入" v-model="form.decorationLength" disabled></a-input>
-                    </a-form-item>
-                  </a-col> 
-                  <a-col :md="8" :sm="24">
-                    <a-form-item label="专用区" prop='exclusiveZone'>
-                        <a-input placeholder="请输入" v-model="form.exclusiveZone" disabled></a-input>
-                    </a-form-item>
-                  </a-col>    
               </a-row>
             </a-form>
         </div>

src/views/production/safetyStock/safetyStockList.vue

@@ -7,41 +7,26 @@
             <a-form layout="inline" @keyup.enter.native="searchQuery">
               <a-row :gutter="24">
                 <a-col :md="4" :sm="24">
-                  <a-form-item label="存货编码">
+                  <a-form-item label="料品编码">
                     <a-input placeholder="请输入" v-model="queryParam.inventoryCode" ></a-input>
                   </a-form-item>
                 </a-col>
                 <a-col  :md="4" :sm="24">
-                  <a-form-item label="存货名称">
+                  <a-form-item label="料品名称">
                     <a-input placeholder="请输入" v-model="queryParam.inventoryName"></a-input>
                   </a-form-item>
                 </a-col>
                 <a-col :md="4" :sm="24">
-                    <a-form-item label="颜色">
-                        <a-input placeholder="请输入" v-model="queryParam.color" ></a-input>
+                    <a-form-item label="料品属性">
+                        <a-input placeholder="请输入" v-model="queryParam.attribute" ></a-input>
                     </a-form-item>
                   </a-col>
-                  <a-col :md="4" :sm="24">
-                    <a-form-item label="定尺">
-                        <a-input placeholder="请输入" v-model="queryParam.fixedLength" ></a-input>
-                    </a-form-item>
-                  </a-col>
-                <template v-if="toggleSearchStatus">
-                  <a-col :md="4" :sm="24">
-                    <a-form-item label="合金">
-                      <a-input placeholder="请输入" v-model="queryParam.alloy" ></a-input>
-                    </a-form-item>
-                  </a-col>
-                  <a-col :md="4" :sm="24">
-                    <a-form-item label="标准">
-                    <a-input placeholder="请输入" v-model="queryParam.standard" ></a-input>
-                  </a-form-item>
-                  </a-col>
                   <a-col :md="4" :sm="24">
                     <a-form-item label="规格">
                       <a-input placeholder="请输入" v-model="queryParam.specs"></a-input>
                     </a-form-item>
                   </a-col>
+                <template v-if="toggleSearchStatus"> 
                   <a-col :md="4" :sm="24">
                     <a-form-item label="型号">
                       <a-input placeholder="请输入" v-model="queryParam.model" ></a-input>
@@ -52,54 +37,6 @@
                       <a-input placeholder="请输入" v-model="queryParam.safetyStock"></a-input>
                     </a-form-item>
                   </a-col>
-                  <a-col :md="4" :sm="24">
-                    <a-form-item label="最高库存">
-                      <a-input placeholder="请输入" v-model="queryParam.maxStock"></a-input>
-                    </a-form-item>
-                  </a-col>
-                  <a-col :md="4" :sm="24">
-                    <a-form-item label="起订点">
-                      <a-input placeholder="请输入" v-model="queryParam.startingPoint"></a-input>
-                    </a-form-item>
-                  </a-col>
-                  <a-col :md="4" :sm="24">
-                    <a-form-item label="辅单位">
-                      <a-input placeholder="请输入" v-model="queryParam.auxiliaryUnit"></a-input>
-                    </a-form-item>
-                  </a-col>
-                  <a-col :md="4" :sm="24">
-                    <a-form-item label="单位">
-                        <a-input placeholder="请输入" v-model="queryParam.unit"></a-input>
-                    </a-form-item>
-                  </a-col>
-                  <a-col :md="4" :sm="24">
-                    <a-form-item label="按辅计量计算" prop='isAuxiliaryUnit'>
-                      <a-select v-model="queryParam.isAuxiliaryUnit"  style='width:100%' >
-                                <a-select-option value='是'> 是</a-select-option>
-                                <a-select-option value='否'> 否</a-select-option>
-                      </a-select>
-                    </a-form-item>
-                  </a-col>  
-                  <a-col :md="4" :sm="24">
-                    <a-form-item label="米重" prop='meterWeight'>
-                        <a-input placeholder="请输入" v-model="queryParam.meterWeight"></a-input>
-                    </a-form-item>
-                  </a-col> 
-                  <a-col :md="4" :sm="24">
-                    <a-form-item label="窗号" prop='windowNo'>
-                        <a-input placeholder="请输入" v-model="queryParam.windowNo"></a-input>
-                    </a-form-item>
-                  </a-col>  
-                  <a-col :md="4" :sm="24">
-                    <a-form-item label="装饰面周长" prop='decorationLength'>
-                        <a-input placeholder="请输入" v-model="queryParam.decorationLength"></a-input>
-                    </a-form-item>
-                  </a-col> 
-                  <a-col :md="4" :sm="24">
-                    <a-form-item label="专用区" prop='exclusiveZone'>
-                        <a-input placeholder="请输入" v-model="queryParam.exclusiveZone"></a-input>
-                    </a-form-item>
-                  </a-col>
                 </template>
                 <a-col  :md="4" :sm="24">
                   <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -140,7 +77,7 @@
               :columns="columns"
               :dataSource="dataSource"
               :pagination="ipagination"
-              :scroll="{ x: 2500, y: 300 }"
+              :scroll="{ x: 1500, y: 300 }"
               :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
               @change="handleTableChange"
               :customRow ="clickRow"
@@ -205,44 +142,23 @@
                   }
                 },
                 {
-                  title: '存货编码',
+                  title: '料品编码',
                   align:"center",
                   dataIndex: 'inventoryCode',
                   ellipsis: true,
     
                 },
                 {
-                  title: '存货名称',
+                  title: '料品名称',
                   align:"center",
                   dataIndex: 'inventoryName',
                   ellipsis: true,
     
                 },
                 {
-                  title: '颜色',
-                  align:"center",
-                  dataIndex: 'color',
-                  ellipsis: true,
-    
-                },
-                {
-                  title: '定尺',
-                  align:"center",
-                  dataIndex: 'fixedLength',
-                  ellipsis: true,
-    
-                },
-                {
-                  title: '合金',
-                  align:"center",
-                  dataIndex: 'alloy',
-                  ellipsis: true,
-    
-                },
-                {
-                  title: '标准',
+                  title: '料品属性',
                   align:"center",
-                  dataIndex: 'standard',
+                  dataIndex: 'attribute',
                   ellipsis: true,
     
                 },
@@ -267,69 +183,6 @@
                   ellipsis: true,
     
                 },
-                {
-                  title: '最高库存',
-                  align:"center",
-                  dataIndex: 'maxStock',
-                  ellipsis: true,
-    
-                },
-                {
-                  title: '起订点',
-                  align:"center",
-                  dataIndex: 'startingPoint',
-                  ellipsis: true,
-    
-                },
-                {
-                  title: '辅单位',
-                  align:"center",
-                  dataIndex: 'auxiliaryUnit',
-                  ellipsis: true,
-    
-                },
-                {
-                  title: '单位',
-                  align:"center",
-                  dataIndex: 'unit',
-                  ellipsis: true,
-    
-                },
-                {
-                  title: '按辅计量计算',
-                  align:"center",
-                  dataIndex: 'isAuxiliaryUnit',
-                  ellipsis: true,
-    
-                },
-                {
-                  title: '米重',
-                  align:"center",
-                  dataIndex: 'meterWeight',
-                  ellipsis: true,
-    
-                },
-                {
-                  title: '窗号',
-                  align:"center",
-                  dataIndex: 'windowNo',
-                  ellipsis: true,
-    
-                },
-                {
-                  title: '装饰面周长',
-                  align:"center",
-                  dataIndex: 'decorationLength',
-                  ellipsis: true,
-    
-                },
-                {
-                  title: '专用区',
-                  align:"center",
-                  dataIndex: 'exclusiveZone',
-                  ellipsis: true,
-    
-                },
               ],
               url: {
                     list: "/production/safetyStock/list",