Merge branch 'demo_' of http://123.60.19.203:8088/hitch/hitch-antd into demo_

src/views/check/checkstandard/CheckStandard.vue

@@ -146,7 +146,9 @@
             <a-divider type="vertical"/>
             <!--            <a  @click="handleViewCheckJob(record)">保养任务</a>-->
             <a v-if="record.isGet==1" @click="handleViewCheckJob(record)">保养任务</a>
-            <a v-if="record.isGet==0" @click="addBYTask(record)">生成保养任务</a>
+            <a v-if=" record.isGet==0 && checkType==2 " @click="addBYTask(record)">生成保养任务</a>
+            <a v-if=" record.isGet==0 && checkType==1 " @click="addBYTask(record)">生成点检任务</a>
+            <a v-if=" record.isGet==0 && checkType==3 " @click="addBYTask(record)">生成润滑任务</a>
             <a-divider type="vertical"/>
             <a v-if="($auth('check-spot-standards-edit')||$auth('check-polling-standards-edit'))" @click="handleEdit(record)">修改</a>
             <a-divider type="vertical"/>

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

@@ -135,7 +135,7 @@ export default {
       // 查询参数
       queryParam: {
         filter: 0,
-        searchType: 3
+        searchType: 7
       },
       visible: true,
       // 表头

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

@@ -103,10 +103,10 @@
       </a-layout>
       <title-divider title="配件清单" width="90px"></title-divider>
       <div class="table-operator" v-if="$auth('repair-application-forms-finish')">
-        <a-button type="primary" @click="handleSpareSelect">
+<!--        <a-button type="primary" @click="handleSpareSelect">
           <a-icon type="plus"/>
           添加
-        </a-button>
+        </a-button>-->
       </div>
       <a-table
         :data-source="dataSpare"
@@ -116,10 +116,10 @@
       </a-table>
       <title-divider title="费用清单" width="90px"></title-divider>
       <div class="table-operator" v-if="$auth('repair-application-forms-finish') ">
-        <a-button type="primary" @click="handleAddFee">
+<!--        <a-button type="primary" @click="handleAddFee">
           <a-icon type="plus"/>
           添加
-        </a-button>
+        </a-button>-->
       </div>
       <a-table
         :data-source="dataFee"
@@ -142,10 +142,10 @@
       </a-table>
       <title-divider title="维修报告" width="90px"></title-divider>
       <div class="table-operator" >
-        <a-button type="primary" v-if="$auth('repair-repair-reasons-add') && ((dataReason === null) || (dataReason.length===0))" @click="handleAddReason">
+<!--        <a-button type="primary" v-if="$auth('repair-repair-reasons-add') && ((dataReason === null) || (dataReason.length===0))" @click="handleAddReason">
           <a-icon type="plus"/>
           添加
-        </a-button>
+        </a-button>-->
       </div>
       <a-table
         :data-source="dataReason"

src/views/sb/modelbom/modules/Detail.vue

@@ -196,7 +196,7 @@ export default {
     handleSpareSelected (record, keys, rows) {
       const addData = []
       for (let i = 0; i < rows.length; i++) {
-        addData.push({ modelId: this.model.id, spareId: rows[i].id, spareName: rows[i].name, num: 1, period: 500, periodType: 6 })
+        addData.push({ sbId: this.model.id, modelId: this.model.id, spareId: rows[i].id, spareName: rows[i].name, num: 1, period: 500, periodType: 6 })
       }
       addSbModelBomBatch(addData)
         .then((response) => {

src/views/store/instoreform/modules/BaseForm.vue

@@ -340,6 +340,7 @@ export default {
           return
         }
         values.detailList = this.data
+
         values.userTime = BaseTool.Date.formatter(values.userTime, BaseTool.Date.PICKER_NORM_DATE_PATTERN)
         // 日期处理
         if (this.BaseTool.String.isBlank(values.id)) {