完善

src/views/idle-assets/modules/BaseForm.vue

@@ -138,13 +138,13 @@ export default {
           key: 'name'
         },
         {
-          title: '设备位号',
-          dataIndex: 'positionNo',
+          title: '原设备位号',
+          dataIndex: 'oldPositionNo',
           width: 150,
-          key: 'positionNo'
+          key: 'oldPositionNo'
         },
         {
-          title: '新位号',
+          title: '新设备位号',
           dataIndex: 'newPositionNo',
           width: 150,
           key: 'newPositionNo',

src/views/purchase/purchase-order-page/modules/BaseForm.vue

@@ -247,7 +247,12 @@
         <template slot="cbmemo" slot-scope="text, record">
           <a-input v-model="record.cbmemo" />
         </template>
-
+        <template slot="cdefine28" slot-scope="text, record">
+          <a-input v-model="record.cdefine28" />
+        </template>
+        <template slot="cdefine22" slot-scope="text, record">
+          <a-input v-model="record.cdefine22" />
+        </template>
         <span slot="action" slot-scope="record">
           <template>
             <a-popconfirm title="是否要删除该条数据？" @confirm="handleDelOne(record)">
@@ -294,6 +299,7 @@ export default {
       columns: [
         {
           title: '序号',
+          width: 50,
           dataIndex: 'index',
           customRender: (text, record, index) => {
             return index + 1
@@ -301,28 +307,46 @@ export default {
         },
         {
           title: '物料名称',
+          width: 100,
           dataIndex: 'spareName'
         },
         {
           title: '存货编码',
+          width: 100,
           dataIndex: 'no'
         },
         {
           title: '规格型号',
+          width: 100,
           dataIndex: 'ggxh'
         },
         {
           title: '仓库名称',
+          width: 100,
           dataIndex: 'storeName'
         },
         {
           title: '货架号',
+          width: 150,
           dataIndex: 'storePosition'
         },
         {
           title: '批号',
+          width: 100,
           dataIndex: 'cbatch'
         },
+        {
+          title: '需求人',
+          dataIndex: 'cdefine22',
+          width: 150,
+          scopedSlots: { customRender: 'cdefine22' }
+        },
+        {
+          title: '使用地点',
+          dataIndex: 'cdefine28',
+          width: 150,
+          scopedSlots: { customRender: 'cdefine28' }
+        },
         {
           title: '物资描述',
           dataIndex: 'cbmemo',
@@ -446,7 +470,9 @@ export default {
           'cdepcode',
           'cbustype',
           'planGetDate',
-          'needDate'
+          'needDate',
+          'cdefine22',
+          'cdefine28'
         ])))
       })
     },

src/views/purchase/purchase-order-page/modules/Detail.vue

@@ -33,13 +33,14 @@
       :data-source="model.detailVOS"
       :columns="columns"
       tableLayout="auto"
+      :scroll="{ x: 1500 }"
       rowKey="id"
     >
     </a-table>
     <template slot="footer">
       <a-button :loading="confirmLoading" type="primary" @click="handleCancel()">返回</a-button>
     </template>
-    </detail-list-item></a-modal>
+  </a-modal>
 </template>
 
 <script>
@@ -103,6 +104,16 @@ export default {
           dataIndex: 'storePosition',
           width: 100
         },
+        {
+          title: '使用地点',
+          dataIndex: 'cdefine28',
+          width: 100
+        },
+        {
+          title: '需求人',
+          dataIndex: 'cdefine22',
+          width: 100
+        },
         {
           title: '申请数量',
           dataIndex: 'num',
@@ -120,7 +131,7 @@ export default {
         },
         {
           title: '单价',
-          dataIndex: 'ftaxprice',
+          dataIndex: 'funitprice',
           width: 100
         },
         {
@@ -133,7 +144,7 @@ export default {
         },
         {
           title: '价税合计',
-          dataIndex: 'iorisum',
+          dataIndex: 'fmoney',
           width: 100,
           customRender: (text, record, index) => {
             return text.toFixed(2)