完善

src/views/sqarepartmanage/sparepartinfo/SparePartInfo.vue

@@ -321,27 +321,27 @@ export default {
             return record.producerName
           }
         },
-        {
-          title: '英文名称',
-          checked: true,
-          width: '150px',
-          dataIndex: 'englishName'
-        },
-        {
-          title: '助记码',
-          checked: true,
-          width: '150px',
-          dataIndex: 'zjm'
-        },
-        {
-          title: '产地',
-          checked: true,
-          width: '150px',
-          dataIndex: 'cd',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Object.getField(this.cdMap, text)
-          }
-        },
+        // {
+        //   title: '英文名称',
+        //   checked: true,
+        //   width: '150px',
+        //   dataIndex: 'englishName'
+        // },
+        // {
+        //   title: '助记码',
+        //   checked: true,
+        //   width: '150px',
+        //   dataIndex: 'zjm'
+        // },
+        // {
+        //   title: '产地',
+        //   checked: true,
+        //   width: '150px',
+        //   dataIndex: 'cd',
+        //   customRender: (text, record, index) => {
+        //     return this.BaseTool.Object.getField(this.cdMap, text)
+        //   }
+        // },
         {
           title: '用途',
           checked: true,

src/views/sqarepartmanage/sparepartinfo/modules/BaseForm.vue

@@ -65,7 +65,7 @@
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
             <a-input
-              v-decorator="['ggxh']" />
+              v-decorator="['ggxh', {rules: [{required: true, message: '规格型号不能为空'}]}]" />
           </a-form-item>
         </row-item>
         <row-item>
@@ -109,6 +109,16 @@
             <a-button style="width: 30%" type="primary" @click="handleSupplierSelect">选择</a-button>
           </a-form-item>
         </row-item>
+        <row-item>
+          <a-form-item
+            label="品牌"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-input
+              v-decorator="['brand', {rules: [{required: true, message: '品牌不能为空'}]}]" />
+          </a-form-item>
+        </row-item>
         <row-item>
           <a-form-item
             label="备件编号"
@@ -175,14 +185,12 @@
           >
             <a-select
               show-search
-              :value="unitName"
+              v-decorator="['unit', {rules: [{required: true, message: '请选择计量单位'}]}]"
               :default-active-first-option="false"
               :show-arrow="true"
               :filter-option="true"
               :not-found-content="null"
-              @search="handleSearch"
-              @blur="handleBlur"
-              @change="handleChange">
+            >
               <a-select-option
                 v-for="(label,value) in unitMap"
                 :key="value"
@@ -264,7 +272,7 @@
             <a-input-number
               style="width: 100%"
               :min="1"
-              v-decorator="['maxStock']" />
+              v-decorator="['maxStock', {rules: [{required: true, message: '最高库存不能为空'}]}]" />
           </a-form-item>
         </row-item>
         <row-item>
@@ -276,7 +284,7 @@
             <a-input-number
               style="width: 100%"
               :min="1"
-              v-decorator="['minStock']" />
+              v-decorator="['minStock', {rules: [{required: true, message: '最低库存不能为空'}]}]" />
           </a-form-item>
         </row-item>
         <row-item v-show="isAdd">
@@ -291,7 +299,7 @@
               :treeData="storeTreeDate"
               :treeNodeFilterProp="'title'"
               :showSearch="true"
-              v-decorator="['storeId', {rules: [{required: false, message: '仓库库位不能为空'}]}]"
+              v-decorator="['storeId']"
               placeholder="请选择"
             >
             </a-tree-select>
@@ -591,7 +599,7 @@ export default {
       const { form: { setFieldsValue } } = this
       this.applicationFileList = record.applicationFileList
       this.defaultApplicationFileList = this.BaseTool.UPLOAD.transImg(this.applicationFileList)
-      this.unitName = record.unit
+      // this.unitName = record.unit
       this.unitNameBz = record.unitBz
       this.gg = record.ggxh
       // 日期处理
@@ -659,7 +667,7 @@ export default {
       this.confirmLoading = true
       console.log('sbId: ' + this.sbId)
       setFieldsValue({
-        'unit': this.unitName,
+        // 'unit': this.unitName,
         'unitBz': this.unitNameBz,
         'sbId': this.sbId
       })

src/views/store/instoreform/modules/BaseForm.vue

@@ -6,7 +6,7 @@
         <a-input v-decorator="['storeId']" type="hidden"/>
       </a-form-item>
       <a-row :gutter="24">
-        <a-col :lg="12" :md="24" :sm="24">
+        <!-- <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
             label="入库单号"
             :labelCol="BaseTool.Constant.labelCol"
@@ -35,7 +35,7 @@
             >
             </a-tree-select>
           </a-form-item>
-        </a-col>
+        </a-col> -->
         <!--        <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
             label="采购单号"
@@ -49,7 +49,7 @@
             <a-button type="primary" style="width:30%"  @click="handlePurchaseOrderSelect">查看明细</a-button>
           </a-form-item>
         </a-col>-->
-        <a-col :lg="12" :md="24" :sm="24">
+        <!-- <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
             label="操作人"
             :labelCol="BaseTool.Constant.labelCol"
@@ -76,7 +76,7 @@
               :format="BaseTool.Date.PICKER_NORM_DATE_PATTERN"
               v-decorator="['userTime']" />
           </a-form-item>
-        </a-col>
+        </a-col> -->
         <!--        <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
             label="发运单号"
@@ -245,6 +245,10 @@ export default {
           title: '原厂编号',
           dataIndex: 'initNo'
         },
+        {
+          title: '原厂编号',
+          dataIndex: 'brand'
+        },
         {
           title: '数量',
           dataIndex: 'num',
@@ -257,12 +261,12 @@ export default {
           width: 150,
           scopedSlots: { customRender: 'price' }
         },
-        {
-          title: '总价',
-          dataIndex: 'totalPrice',
-          width: 150,
-          scopedSlots: { customRender: 'totalPrice' }
-        },
+        // {
+        //   title: '总价',
+        //   dataIndex: 'totalPrice',
+        //   width: 150,
+        //   scopedSlots: { customRender: 'totalPrice' }
+        // },
         {
           title: '操作',
           key: 'action',