whj 1 år sedan
förälder
incheckning
26873f5973

+ 1 - 1
src/views/sqarepartmanage/sparepartinfo/SparePartInfo.vue

@@ -143,7 +143,7 @@
           showPagination="auto"
         >
           <span slot="status" slot-scope="text, record">
-            <a @click="handleStore(record)">{{ text||"" }}</a>
+            <a @click="handleStore(record)">{{ text||"0" }}</a>
           </span>
           <span slot="action" slot-scope="record">
             <template>

+ 45 - 0
src/views/sqarepartmanage/sparepartinfo/SpareStoreTotal.vue

@@ -111,6 +111,7 @@
       :columns="columns"
       :data="loadData"
       :alert="options.alert"
+      :scroll="{x: 1500, y: BaseTool.Constant.scrollY}"
       :rowSelection="options.rowSelection"
       showPagination="auto"
     >
@@ -185,6 +186,7 @@ export default {
       columns: [
         {
           title: '序号',
+          width: '100px',
           dataIndex: 'index',
           checked: true,
           customRender: (text, record, index) => {
@@ -193,11 +195,13 @@ export default {
         },
         {
           title: '编号',
+          width: '150px',
           checked: true,
           dataIndex: 'no'
         },
         {
           title: '备件名称',
+          width: '150px',
           checked: true,
           dataIndex: 'name'
         },
@@ -209,36 +213,43 @@ export default {
         },
         {
           title: '规格型号',
+          width: '150px',
           checked: true,
           dataIndex: 'ggxh'
         },
         {
           title: '品牌',
+          width: '150px',
           checked: true,
           dataIndex: 'brand'
         },
         {
           title: '计量单位',
+          width: '150px',
           checked: true,
           dataIndex: 'unit'
         },
         {
           title: '单价',
+          width: '150px',
           checked: true,
           dataIndex: 'price'
         },
         {
           title: '最低库存',
+          width: '150px',
           checked: true,
           dataIndex: 'minStock'
         },
         {
           title: '最高库存',
+          width: '150px',
           checked: true,
           dataIndex: 'maxStock'
         },
         {
           title: '实际库存',
+          width: '150px',
           checked: true,
           dataIndex: 'totalStock',
           customRender: (text, record, index) => {
@@ -249,6 +260,39 @@ export default {
             }
           }
         },
+        {
+          title: '等级',
+          checked: true,
+          width: '150px',
+          dataIndex: 'level',
+          customRender: (text, record, index) => {
+            return this.BaseTool.Object.getField(this.levelMap, text)
+          }
+        },
+        {
+          title: '生产商',
+          checked: true,
+          width: '150px',
+          dataIndex: 'producerId',
+          customRender: (text, record, index) => {
+            return record.producerName
+          }
+        },
+        {
+          title: '用途',
+          checked: true,
+          width: '150px',
+          dataIndex: 'yt',
+          customRender: (text, record, index) => {
+            return this.BaseTool.Object.getField(this.ytMap, text)
+          }
+        },
+        {
+          title: '备注',
+          checked: true,
+          width: '150px',
+          dataIndex: 'remark'
+        },
         {
           title: '状态',
           checked: true,
@@ -259,6 +303,7 @@ export default {
           title: '操作',
           checked: true,
           key: 'action',
+          fixed: 'right',
           width: '200px',
           align: 'center',
           scopedSlots: { customRender: 'action' }

+ 11 - 11
src/views/sqarepartmanage/sparepartinfo/modules/BaseForm.vue

@@ -150,16 +150,16 @@
               v-decorator="['zbh', {rules: [{required: false, message: '自编号不能为空'}]}]" />
           </a-form-item>
         </row-item>
-<!--        <row-item>-->
-<!--          <a-form-item-->
-<!--            label="助记码"-->
-<!--            :labelCol="BaseTool.Constant.labelCol"-->
-<!--            :wrapperCol="BaseTool.Constant.wrapperCol"-->
-<!--          >-->
-<!--            <a-input-->
-<!--              v-decorator="['zjm']" />-->
-<!--          </a-form-item>-->
-<!--        </row-item>-->
+        <!--        <row-item>-->
+        <!--          <a-form-item-->
+        <!--            label="助记码"-->
+        <!--            :labelCol="BaseTool.Constant.labelCol"-->
+        <!--            :wrapperCol="BaseTool.Constant.wrapperCol"-->
+        <!--          >-->
+        <!--            <a-input-->
+        <!--              v-decorator="['zjm']" />-->
+        <!--          </a-form-item>-->
+        <!--        </row-item>-->
 
         <row-item>
           <a-form-item
@@ -283,7 +283,7 @@
           >
             <a-input-number
               style="width: 100%"
-              :min="1"
+              :min="0"
               v-decorator="['minStock', {rules: [{required: true, message: '最低库存不能为空'}]}]" />
           </a-form-item>
         </row-item>

+ 109 - 0
src/views/store/fastoutstore/FastOutStore.vue

@@ -10,6 +10,86 @@
                   <a-input v-model="queryParam.keyword" placeholder="请输入名称/编码"/>
                 </a-form-item>
               </a-col>
+              <a-col :md="8" :sm="24">
+                <a-form-item label="品牌">
+                  <a-input v-model="queryParam.brand" placeholder="模糊查询"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="8" :sm="24">
+                <a-form-item label="类型">
+                  <a-tree-select
+                    style="width: 100%"
+                    :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
+                    :treeData="spareTypeTreeData"
+                    :treeNodeFilterProp="'title'"
+                    :showSearch="true"
+                    v-model="queryParam.typeId"
+                    placeholder="请选择"
+                  >
+                  </a-tree-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="8" :sm="24">
+                <a-form-item label="规格型号">
+                  <a-input v-model="queryParam.ggxh" placeholder="模糊查询"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="8" :sm="24">
+                <a-form-item label="原厂编号">
+                  <a-input v-model="queryParam.initNo" placeholder="模糊查询"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="8" :sm="24">
+                <a-form-item label="生产商">
+                  <a-input v-model="queryParam.producerName" placeholder="名称模糊查询"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="8" :sm="24">
+                <a-form-item label="供应商">
+                  <a-input v-model="queryParam.supplierName" placeholder="名称模糊查询"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="8" :sm="24">
+                <a-form-item label="等级">
+                  <a-select v-model="queryParam.level" placeholder="请选择">
+                    <a-select-option
+                      v-for="(label,value) in levelMap"
+                      :key="value"
+                      :label="label"
+                      :value="parseInt(value)">{{ label }}
+                    </a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="用途">
+                  <a-select v-model="queryParam.yt" placeholder="请选择">
+                    <a-select-option
+                      v-for="(label,value) in ytMap"
+                      :key="value"
+                      :label="label"
+                      :value="parseInt(value)">{{ label }}
+                    </a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="是否专用">
+                  <a-select v-model="queryParam.isSpecial" placeholder="请选择">
+                    <a-select-option
+                      v-for="(label,value) in specialMap"
+                      :key="value"
+                      :label="label"
+                      :value="parseInt(value)">{{ label }}
+                    </a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="关联设备">
+                  <a-input v-model="queryParam.model" placeholder="新号/旧号/名称/规格"/>
+                </a-form-item>
+              </a-col>
               <a-col :md="6 || 24" :sm="24">
                 <span class="table-page-search-submitButtons">
                   <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
@@ -56,6 +136,7 @@
 <script>
 import { STable } from '@/components'
 import { getSqarePage, outSqare, inSqare } from '@/api/store/fastoutstore'
+import { fetchSpareTypeTree } from '@/api/sqarepartmanage/sparetype'
 export default {
   name: 'FastOutStore',
   components: {
@@ -151,6 +232,24 @@ export default {
             return this.BaseTool.Object.getField(this.levelMap, text)
           }
         },
+        {
+          title: '生产商',
+          checked: true,
+          width: '150px',
+          dataIndex: 'producerId',
+          customRender: (text, record, index) => {
+            return record.producerName
+          }
+        },
+        {
+          title: '用途',
+          checked: true,
+          width: '150px',
+          dataIndex: 'yt',
+          customRender: (text, record, index) => {
+            return this.BaseTool.Object.getField(this.ytMap, text)
+          }
+        },
         {
           title: '备注',
           checked: true,
@@ -200,7 +299,11 @@ export default {
       },
       selectedRowKeys: [],
       selectedRows: [],
+      spareTypeTreeData: [],
       levelMap: {},
+      specialMap: {},
+      ytMap: {},
+      unitMap: {},
       visible: true,
       num: 1,
       options: {
@@ -216,7 +319,13 @@ export default {
   created () {
     // 下拉框map
     this.levelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SPARE_PART_INFO_LEVEL)
+    this.unitMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBINFO_UNIT)
+    this.ytMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SPARE_USE_TYPE)
+    this.specialMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
     this.tableOption()
+    fetchSpareTypeTree({}).then(res => {
+      this.spareTypeTreeData = res.data
+    })
   },
   methods: {
     tableOption () {

+ 15 - 0
src/views/store/sparestore/SpareStore.vue

@@ -281,6 +281,21 @@ export default {
           width: '150px',
           dataIndex: 'totalPrice'
         },
+        {
+          title: '用途',
+          checked: true,
+          width: '150px',
+          dataIndex: 'yt',
+          customRender: (text, record, index) => {
+            return this.BaseTool.Object.getField(this.ytMap, text)
+          }
+        },
+        {
+          title: '备注',
+          checked: true,
+          width: '150px',
+          dataIndex: 'remark'
+        },
         // {
         // title: '创建日期',
         // dataIndex: 'createdTime'