完善

src/views/repair/application-form/RepairForm.vue

@@ -59,6 +59,18 @@
                 />
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="工单类型">
+                <a-select v-model="queryParam.category" placeholder="请选择">
+                  <a-select-option
+                    v-for="(label,value) in categoryMap"
+                    :key="value"
+                    :label="label"
+                    :value="parseInt(value)">{{ label }}
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
             <a-col :md="8 || 24" :sm="24">
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" @click="handleOk()">查询</a-button>
@@ -351,6 +363,7 @@ export default {
       sourceMap: {},
       levelMap: {},
       statusMap: {},
+      categoryMap: {},
       needStopMap: {},
       planFlagMap: {},
       // 加载数据方法 必须为 Promise 对象
@@ -401,6 +414,7 @@ export default {
       this.dispatchFlag = false
     } */
     // 下拉框map
+    this.categoryMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_CATEGORY)
     this.sourceMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_SOURCE)
     this.levelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_LEVEL)
     this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_STATUS)

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

@@ -51,7 +51,7 @@
             <a-button style="width: 30%" type="primary" @click="handlePartSelect">选择</a-button>
           </a-form-item>
         </row-item>-->
-        <row-item>
+        <!-- <row-item>
           <a-form-item
             label="委托单位"
             :labelCol="BaseTool.Constant.labelCol"
@@ -66,7 +66,7 @@
               </a-select-option>
             </a-select>
           </a-form-item>
-        </row-item>
+        </row-item> -->
         <row-item>
           <a-form-item
             label="维修部门"
@@ -92,7 +92,7 @@
             <a-tree-select
               tree-checkable
               :show-checked-strategy="SHOW_PARENT"
-              v-decorator="['repairProfessor', {rules: [{required: true, message: '检修专业不能为空'}]}]"
+              v-decorator="['repairProfessor', {initialValue: [1], rules: [{required: true, message: '检修专业不能为空'}]}]"
               placeholder="请选择">
               <a-tree-select-node
                 v-for="(label,value) in professorMap"
@@ -155,7 +155,7 @@
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-select @change="changePlanFlag" v-decorator="['category', {rules: [{required: true, message: '工单类别不能为空'}]}]" placeholder="请选择">
+            <a-select @change="changePlanFlag" v-decorator="['category', {initialValue: 2, rules: [{required: true, message: '工单类别不能为空'}]}]" placeholder="请选择">
               <a-select-option
                 v-for="(label,value) in categoryMap"
                 :key="value"
@@ -269,7 +269,7 @@
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-select v-decorator="['level', {rules: [{required: true, message: '工作优选权不能为空'}]}]" placeholder="请选择">
+            <a-select v-decorator="['level', {initialValue: 1, rules: [{required: true, message: '工作优选权不能为空'}]}]" placeholder="请选择">
               <a-select-option
                 v-for="(label,value) in levelMap"
                 :key="value"

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

@@ -161,6 +161,10 @@
               <a-icon type="plus"/>
               添加专用备件
             </a-button>-->
+            <a-divider type="vertical" />
+            <a-button type="primary" @click="handleOutStroe()">
+              快速出库
+            </a-button>
           </div>
           <a-table
             :data-source="dataSpare"
@@ -321,6 +325,7 @@
     <longYanSelectSpareForm ref="longYanSelectSpareForm" @ok="handleOk"/>
     <scheme-library ref="schemeLibrary" @ok="handleOk"/>
     <PlanCheckForm ref="planCheckForm" @ok="handleOk"/>
+    <OutStroeForm ref="outStroeForm" @ok="handleOk" />
   </div>
 </template>
 
@@ -369,6 +374,7 @@ import RepairRecordForm from './RepairRecordForm'
 import ReportUpForm from './ReportUpForm'
 import TicketForm from './TicketForm'
 import LongYanSelectSpareForm from './LongYanSelectSpareForm'
+import OutStroeForm from '@/views/store/outstoreform/modules/BaseFormYY.vue'
 const DetailListItem = DetailList.Item
 
 export default {
@@ -407,7 +413,8 @@ export default {
     RepairRecordForm,
     ReportUpForm,
     TicketForm,
-    LongYanSelectSpareForm
+    LongYanSelectSpareForm,
+    OutStroeForm
   },
   data () {
     return {
@@ -1101,6 +1108,12 @@ export default {
       const modal = this.$refs.checkForm
       modal.base(this.model, 1)
     },
+    handleOutStroe () {
+      this.visible = false
+      const modal = this.$refs.outStroeForm
+      const pick = this.model.sbPositionName + this.model.sbCph
+      modal.base({}, pick, this.model.id)
+    },
     handleOk () {
       this.loading = true
       fetchRepairApplicationForm({ id: this.model.id }).then(res => {

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

@@ -273,12 +273,12 @@
                 <div style="flex:1">允许开工人: <span>
                   {{ model.trustDeptManager }}
                 </span>
-                  <operation-button
+                  <!-- <operation-button
                     v-if="(!model.trustDeptManager ||model.trustDeptManager ==='')"
                     :type="2"
                     :showDivider="false"
                     title="确定签字？"
-                    @confirm="handleSign('trustDeptManager')">签字</operation-button>
+                    @confirm="handleSign('trustDeptManager')">签字</operation-button> -->
                 </div>
                 <div style="flex:1">特殊作业监护人:<a-input style="width:150px" placeholder="属地监护 " /></div>
                 <div style="flex:1">确认完工: <span>

src/views/repair/repair-reason/modules/BaseForm.vue

@@ -53,10 +53,7 @@
               :wrapperCol="BaseTool.Constant.wrapperCol"
             >
               <a-input
-                disabled
-                style="width: 70%"
-                v-decorator="['sbPartName']"/>
-              <a-button type="primary" style="width: 30%" @click="handlePartSelect">选择</a-button>
+                v-decorator="['sbPartName', {rules: [{required: true, message: '故障部位不能为空'}]}]"/>
             </a-form-item>
           </a-col>
         </a-row>

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

@@ -95,6 +95,17 @@
               v-decorator="['userTime', {rules: [{required: true, message: '操作时间不能为空'}]}]" />
           </a-form-item>
         </a-col>
+        <a-col :lg="12" :md="24" :sm="24">
+          <a-form-item
+            label="成本归属"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-input
+              disabled
+              v-model="pickStr" />
+          </a-form-item>
+        </a-col>
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
             label="备注"
@@ -194,6 +205,8 @@ export default {
       visible: false,
       maskClosable: false,
       outFlag: 1,
+      pickStr: '',
+      pickId: '',
       storeId: null,
       // 下拉框map
       typeMap: {},
@@ -280,8 +293,10 @@ export default {
     // this.typeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.OUT_STORE_FORM_TYPE)
   },
   methods: {
-    base (record) {
+    base (record, pickStr, pickId) {
       this.visible = true
+      this.pickStr = pickStr
+      this.pickId = pickId
       this.outFlag = record.outFlag
       if (record.outFlag === 1) {
         this.typeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.OUT_STORE_FORM_TYPE)
@@ -344,6 +359,7 @@ export default {
         }
         values.outFlag = this.outFlag
         values.detailList = this.data
+        values.pickId = this.pickId
         values.userTime = BaseTool.Date.formatter(values.userTime, BaseTool.Date.PICKER_NORM_DATE_PATTERN)
         // 日期处理
         if (this.BaseTool.String.isBlank(values.id)) {