whj 1 年間 前
コミット
644127fdcb

+ 15 - 1
src/api/sqarepartmanage/sparepartinfo.js

@@ -111,7 +111,21 @@ export function fetchSparePartInfo (parameter) {
     }
   })
 }
-
+/**
+ * fetch single func
+ * parameter: { }
+ * @param parameter
+ * @returns {*}
+ */
+export function fetchSparePartInfo2 (parameter) {
+  return axios({
+    url: '/sqarepartmanage/spare-part-info/getVO/' + parameter.id,
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
 /**
  * fetch single func 查找备件仓库信息列表
  * parameter: { }

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

@@ -190,7 +190,7 @@ import {
   getSparePartInfoPage,
   updateSpareIdsBatch,
   deleteSparePartInfos,
-  fetchSparePartInfo,
+  fetchSparePartInfo2,
   fetchStoreList,
   fetchInStoreList,
   fetchOutStoreList,
@@ -455,7 +455,7 @@ export default {
     },
     handleEdit (record) {
       this.visible = false
-      fetchSparePartInfo({ id: record.id }).then(res => {
+      fetchSparePartInfo2({ id: record.id }).then(res => {
         const modal = this.$refs.baseModal
         modal.base(res.data)
       })
@@ -467,7 +467,7 @@ export default {
     },
     handleCopy (record) {
       this.visible = false
-      fetchSparePartInfo({ id: record.id }).then(res => {
+      fetchSparePartInfo2({ id: record.id }).then(res => {
         const modal = this.$refs.baseModal
         res.data.id = null
         modal.base(res.data)
@@ -500,7 +500,7 @@ export default {
     },
     handleView (record) {
       this.visible = false
-      fetchSparePartInfo({ id: record.id }).then(res => {
+      fetchSparePartInfo2({ id: record.id }).then(res => {
         const modal = this.$refs.detailModal
         modal.base(res.data)
       })

+ 4 - 2
src/views/sqarepartmanage/sparepartinfo/modules/BaseForm.vue

@@ -287,7 +287,7 @@
               v-decorator="['minStock', {rules: [{required: true, message: '最低库存不能为空'}]}]" />
           </a-form-item>
         </row-item>
-        <row-item v-show="isAdd">
+        <row-item >
           <a-form-item
             label="初始库位"
             :labelCol="BaseTool.Constant.labelCol"
@@ -297,6 +297,7 @@
               style="width: 100%"
               :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
               :treeData="storeTreeDate"
+              :disabled="!isAdd"
               :treeNodeFilterProp="'title'"
               :showSearch="true"
               v-decorator="['storeId']"
@@ -638,6 +639,7 @@ export default {
           'ggxh',
           'yt',
           'zjm',
+          'storeId',
           'isSpecial',
           'zbh',
           'agePeriod',
@@ -729,7 +731,7 @@ export default {
       this.unitName = null
       this.unitNameBz = null
       this.gg = null
-      this.isAdd = true
+      this.isAdd = false
       this.data = []
       if (this.BaseTool.Object.isNotBlank(values)) {
         this.$emit('ok', values)

+ 17 - 16
src/views/sqarepartmanage/sparepartinfo/modules/Detail.vue

@@ -8,7 +8,7 @@
       </a-col>
     </a-row>
     <title-divider title="基础信息" width="90px"></title-divider>
-    <detail-list title="" :col="3">
+    <detail-list-item title="" :col="3">
       <detail-list-item term="id">{{ model.id }}</detail-list-item>
       <detail-list-item term="集团统一编码">{{ model.uniteNo }}</detail-list-item>
       <detail-list-item term="自编号">{{ model.zbh }}</detail-list-item>
@@ -33,6 +33,7 @@
       <detail-list-item term="当前库存">{{ model.currentStock }}</detail-list-item>
       <detail-list-item term="最高库存">{{ model.maxStock }}</detail-list-item>
       <detail-list-item term="最低库存">{{ model.minStock }}</detail-list-item>
+      <detail-list-item term="库位">{{ model.storeName }}</detail-list-item>
       <detail-list-item term="初始库存">{{ model.initStock }}</detail-list-item>
       <detail-list-item term="英文名称">{{ model.englishName }}</detail-list-item>
       <detail-list-item term="助记码">{{ model.zjm }}</detail-list-item>
@@ -48,21 +49,21 @@
       <detail-list-item>
         <img-code :src="model.qrCode" :type="2" title="点击重新生成二维码" :code-id="model.id" :width="200"></img-code>
       </detail-list-item>
-    </detail-list>
-    <title-divider title="设备信息" width="100px"></title-divider>
-    <div class="table-operator">
-    </div>
-    <a-table
-      :data-source="data"
-      :columns="columns"
-      bordered
-      tableLayout="auto"
-      rowKey="id">
-    </a-table>
-    <template slot="footer">
-      <a-button :loading="confirmLoading" type="primary" @click="handleCancel()">返回</a-button>
-    </template>
-  </a-card>
+      </detail-list>
+      <title-divider title="设备信息" width="100px"></title-divider>
+      <div class="table-operator">
+      </div>
+      <a-table
+        :data-source="data"
+        :columns="columns"
+        bordered
+        tableLayout="auto"
+        rowKey="id">
+      </a-table>
+      <template slot="footer">
+        <a-button :loading="confirmLoading" type="primary" @click="handleCancel()">返回</a-button>
+      </template>
+    </detail-list-item></a-card>
 </template>
 
 <script>