维修优化

src/components/Table/index.js

@@ -16,7 +16,7 @@ export default {
         ...this.pagination,
         showTotal: total => `共 ${total} 条数据`,
         showSizeChanger: true,
-        pageSizeOptions: ['10', '20', '50', '500']
+        pageSizeOptions: ['10', '20', '50', '150', '500']
       })
     }
   },

src/utils/dict.js

@@ -125,6 +125,7 @@ DictCache.TYPE = {
   SB_CHECK_GOOD_TYPE: 'SB_CHECK_GOOD_TYPE', // 验收物品类型：设备，备件，物资
   SB_CHECK_FORM_STATUS: 'SB_CHECK_FORM_STATUS', // 验收状态
   OUT_STORE_FORM_TYPE: 'OUT_STORE_FORM_TYPE', // 出库类型
+  FEE_FORM_TYPE: 'FEE_FORM_TYPE', // 成本归属
   OUT_STORE_FORM_STATUS: 'OUT_STORE_FORM_STATUS', // 出库状态
   SPARE_PICK_FORM_TYPE: 'SPARE_PICK_FORM_TYPE', // 领用类型，
   SPARE_PICK_FORM_STATUS: 'SPARE_PICK_FORM_STATUS', // 备件领用登记单状态，

src/views/repair/application-form/modules/DetailRepair.vue

@@ -1120,7 +1120,7 @@ export default {
     handleOutStroe () {
       this.visible = false
       const modal = this.$refs.outStroeForm
-      modal.base({}, this.model)
+      modal.base({ outFlag: 1 }, this.model)
     },
     handleOk () {
       this.loading = true

src/views/store/outstoreform/OutStoreFormYY.vue

@@ -273,7 +273,7 @@ export default {
     handleAdd () {
       this.visible = false
       const modal = this.$refs.baseModal
-      modal.base({ outFlag: this.outFlag })
+      modal.base({ outFlag: this.outFlag }, {})
     },
     handleEdit (record) {
       this.visible = false

src/views/store/outstoreform/modules/BaseFormYY.vue

@@ -101,20 +101,19 @@
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-cascader
-              :options="sbPositionList"
-              :load-data="loadData"
-              placeholder="请选择"
-              change-on-select
-              v-decorator="['sbPosition', {rules: [{required: true, message: '生产装置不能为空'}]}]"
-            />
-            <a-input
-              v-decorator="['sbCph']" />
+            <a-select v-decorator="['feeFrom', {rules: [{required: true, message: '成本归属不能为空'}]}]" placeholder="请选择">
+              <a-select-option
+                v-for="(label,value) in feeFromMap"
+                :key="value"
+                :label="label"
+                :value="value">{{ label }}
+              </a-select-option>
+            </a-select>
           </a-form-item>
         </a-col>
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="备注"
+            label="用途备注"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
@@ -213,7 +212,7 @@ export default {
       outFlag: 1,
       model: {},
       sbPositionList: [],
-
+      feeFromMap: {},
       storeId: null,
       // 下拉框map
       typeMap: {},
@@ -298,7 +297,7 @@ export default {
   created () {
     // 下拉框map
     this.getSbPositions()
-
+    this.feeFromMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.FEE_FORM_TYPE)
     // this.typeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.OUT_STORE_FORM_TYPE)
   },
   methods: {

src/views/store/outstoreform/modules/TicketForm.vue

@@ -33,10 +33,10 @@
             <td colspan="1" style="text-align:left;">
               {{ type? '领库':'退库' }}单位或个人：{{ model.createdUserName }}
             </td>
-            <td colspan="2" style="text-align:left;">
+            <td colspan="3" style="text-align:left;">
               用途：{{ model.remark }}
             </td>
-            <td colspan="3" style="text-align:left;">
+            <td colspan="2" style="text-align:left;">
               成本归属：{{ model.feeFrom }}
             </td>
           </tr>