Merge remote-tracking branch 'origin/master'

src/api/eam/eam.js

@@ -137,6 +137,7 @@ export const saveCheckOrderReport = data => createAPI(`/pms/eam/saveCheckOrderRe
 export const changeOrderOperator = data => createAPI(`/pms/eam/changeOrderOperator`,'post',data)
 export const saveOrderReportForDefect= data => createAPI(`/pms/eam/saveOrderReportForDefect`,'post',data)
 export const checkWorkOrder= data => createAPI(`/pms/eam/checkWorkOrder`,'post',data)
+export const returnWorkOrder= data => createAPI(`/pms/eam/returnWorkOrder`,'post',data)
 export const selectNameByMes= data => createAPI(`/pms/eam/selectNameByMes`,'post',data)
 export const submitDefect= data => createAPI(`/pms/eam/submitDefect`,'post',data)
 export const submitDefects= data => createAPI(`/pms/eam/submitDefects`,'post',data)

src/views/modules/eam/eamWorkOrderForMaintenance.vue

@@ -194,6 +194,7 @@
         <el-form-item :label="' '">
           <el-button v-if="saveData.status === '已完工'" type="primary" @click="checkModal()">取消审核</el-button>
           <el-button v-else type="primary" @click="checkModal()">审核</el-button>
+          <el-button v-if="this.saveData.checkResult === '异常'" type="primary" @click="returnModal()">退回</el-button>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top">
@@ -397,6 +398,7 @@
   import Chooselist from '@/views/modules/common/Chooselist_eam'
   import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
   import excel from "@/utils/excel-util.js";
+  import {returnWorkOrder} from "../../../api/eam/eam";
   export default {
     components: {
       Chooselist
@@ -1490,6 +1492,29 @@
           })
         }
       },
+      returnModal(){
+        let mesUser = this.$store.state.user.name
+        this.submitData.site = this.saveData.site
+        this.submitData.buNo = this.saveData.buNo
+        this.submitData.orderNo = this.saveData.orderNo
+        this.submitData.planID = this.saveData.planID
+        this.submitData.objectID = this.saveData.objectID
+        this.submitData.checker = this.saveData.checker
+        this.submitData.checkerName = this.saveData.checkerName
+        this.submitData.status = this.saveData.status
+        if (!this.submitData.checker.split(';').includes(mesUser)){
+          this.$message.warning('审核人员与计划不符！')
+          return
+        }
+        //先保存
+        this.updateWorkOrder()
+        //退回操作
+        returnWorkOrder(this.submitData).then(({data})=>{
+          if (data && data.code === 0) {
+            this.getDataList()
+          }
+        })
+      },
 
       // 批量审核按钮
       checkModals () {

src/views/modules/ecss/ecssTemplate.vue

@@ -119,54 +119,54 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item :label="'模版名称'" >
               <el-input v-model="addModel.name"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12" v-show="addModel.type=='发票'">
             <el-form-item :label="''" >
-              <el-checkbox v-model="addModel.hsCodeDesc">品名</el-checkbox>
+              <el-checkbox v-model="addModel.hsCodeDesc"><span :title="'物料Hscode是否需要显示品名'">品名</span></el-checkbox>
             </el-form-item>
           </el-col>
           <el-col :span="12" v-show="addModel.type=='发票'">
             <el-form-item :label="''" >
-              <el-checkbox v-model="addModel.contractFlag">合同</el-checkbox>
+              <el-checkbox v-model="addModel.contractFlag"><span :title="'发票导出后抬头改成合同'">合同</span></el-checkbox>
             </el-form-item>
           </el-col>
           <el-col :span="12" v-show="addModel.type=='箱单'">
             <el-form-item :label="''" >
-              <el-checkbox v-model="addModel.upc">UPC</el-checkbox>
+              <el-checkbox v-model="addModel.upc"><span :title="'是否需要显示UPC'">UPC</span></el-checkbox>
             </el-form-item>
           </el-col>
           <el-col :span="12" v-show="addModel.type=='箱单'">
             <el-form-item :label="''" >
-              <el-checkbox v-model="addModel.so">SO</el-checkbox>
+              <el-checkbox v-model="addModel.so"><span :title="'是否需要显示SO'">SO</span></el-checkbox>
             </el-form-item>
           </el-col>
           <el-col :span="12" v-show="addModel.type=='箱单' || addModel.type=='发票'">
             <el-form-item :label="''" >
-              <el-checkbox v-model="addModel.goodsLabel">货物明细</el-checkbox>
+              <el-checkbox v-model="addModel.goodsLabel"><span :title="'是否需要显示Name of goods等信息'">货物明细</span></el-checkbox>
             </el-form-item>
           </el-col>
           <el-col :span="12" v-show="addModel.type=='箱单' || addModel.type=='发票'">
             <el-form-item :label="''" >
-              <el-checkbox v-model="addModel.hsCodeFlag">Hs Code</el-checkbox>
+              <el-checkbox v-model="addModel.hsCodeFlag"><span :title="'是否显示Hs Code'">Hs Code</span></el-checkbox>
             </el-form-item>
           </el-col>
           <el-col :span="12" v-show="addModel.type=='箱单' || addModel.type=='发票'">
-            <el-form-item :label="''" >
-              <el-checkbox v-model="addModel.fscWeight">是否维护纯FSC纸重量损耗</el-checkbox>
+            <el-form-item :label="'  '" >
+              <el-checkbox v-model="addModel.fscWeight"><span :title="'是否需要显示'">是否维护纯FSC纸重量损耗</span></el-checkbox>
             </el-form-item>
           </el-col>
           <el-col :span="12" v-show="addModel.type=='发票' || (addModel.type=='箱单' && addModel.buNo==='04-MHM')">
-            <el-form-item :label="'品名类型'" >
+            <el-form-item :label="'品名类型'" :title="'品名显示中文或英文'">
               <el-radio v-model="addModel.hsCodeDescType" label="Y">中文</el-radio>
               <el-radio v-model="addModel.hsCodeDescType" label="N">英文</el-radio>
             </el-form-item>
           </el-col>
           <el-col :span="12" v-show="addModel.type=='箱单'">
-            <el-form-item :label="'序号类型'" >
+            <el-form-item :label="'序号类型'" :title="'天线箱单显示序号还是栈板号'">
               <el-radio v-model="addModel.itemNo" label="Y">序号</el-radio>
               <el-radio v-model="addModel.itemNo" label="N">栈板号</el-radio>
             </el-form-item>
@@ -190,12 +190,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" v-show="addModel.type=='箱单' || addModel.type=='发票'">
-            <el-form-item :label="'制造地'" >
-              <el-input  v-model="addModel.origin"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-show="addModel.type=='箱单' || addModel.type=='发票'">
-            <el-form-item :label="'RFID Base Material'" >
+            <el-form-item :label="'RFID Base Material'" :title="'是否需要显示'">
               <el-checkbox v-model="addModel.material"></el-checkbox>
             </el-form-item>
           </el-col>
@@ -205,7 +200,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" v-show="addModel.type=='箱单' || addModel.type=='发票'">
-            <el-form-item :label="'Non-reusable plastic packaging'" >
+            <el-form-item :label="'Non-reusable plastic packaging'" :title="'是否需要显示'">
               <el-checkbox v-model="addModel.packaging"></el-checkbox>
             </el-form-item>
           </el-col>
@@ -214,7 +209,11 @@
               <el-input :disabled="!addModel.packaging" v-model="addModel.kgs"></el-input>
             </el-form-item>
           </el-col>
-
+          <el-col :span="12" v-show="addModel.type=='箱单' || addModel.type=='发票'">
+            <el-form-item :label="'制造地'" >
+              <el-input  v-model="addModel.origin"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="12" v-show="addModel.type=='出口货物委托书'">
             <el-form-item :label="'贸易方式'" >
               <el-input v-model="addModel.salesMethod"></el-input>
@@ -256,7 +255,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="24" v-show="addModel.type!=='出口货物委托书'" :style="addModel.type=='出口货物委托书'?'margin-top: 60px':''">
-            <el-form-item :label="'备注'" >
+            <el-form-item :label="'备注'" :title="'导出后需要额外显示的信息可在备注里添加'">
               <el-input type="textarea" :rows="3" v-model="addModel.remark"></el-input>
             </el-form-item>
           </el-col>

src/views/modules/part/quicklyCreateBom.vue

@@ -1372,6 +1372,7 @@ export default {
           this.attributeFlag1 = true
           this.inventoryPartTable = 'part_item'
           this.getNodeTree()
+          this.getPartItem()
         } else {
           this.previousCodeNo = this.searchData.codeNo
         }
@@ -3549,6 +3550,7 @@ export default {
         partDesc: row.partDesc,
         printUnit: row.printUnit,
         printUnitName: row.printUnitName,
+        processUnit: row.processUnit,
         bomType: 'Manufacturing',
         nodeId: this.currentNode.nodeId,
         offFlag: '2'

src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue

@@ -54,6 +54,12 @@
           <el-option label="质量" value="R024"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="是否退回">
+        <el-select v-model="searchData.isReturn" clearable style="width: 80px">
+          <el-option label="Y" value="Y"></el-option>
+          <el-option label="N" value="N"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label=" ">
       <el-button v-if="!authSearch" @click="searchClick">查询</el-button>
         <el-button @click="exportExcel()" type="primary" style="margin-left: 2px">{{'导出'}}</el-button>
@@ -135,10 +141,13 @@
                           value-format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss' placeholder="到达时间">
           </el-date-picker>
         </el-form-item>
+        <el-form-item :label="'是否退回'">
+          <el-input v-model="saveData.isReturn" disabled style="width: 100px"></el-input>
+        </el-form-item>
         <el-form-item :label="'维保结论'">
           <el-select v-model="saveData.checkResult" style="width: 100px" placeholder="请选择">
             <el-option label="合格" value="合格"></el-option>
-            <el-option label="异常" value="异常"></el-option>
+            <el-option label="不合格" value="异常"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item v-if="this.saveData.checkResult === '异常'" :label="'异常原因'">
@@ -598,7 +607,8 @@
           page: 1,
           limit: 10,
           searchType: 'reportMaintenance',
-          checkType: ''
+          checkType: '',
+          isReturn: 'N'
         },
         height: 200,
         pageIndex: 1,
@@ -2078,6 +2088,7 @@
       },
 
       reportModal (row) {
+        console.log(row)
         this.saveData = {
           site: row.site,
           buNo: row.buNo,
@@ -2089,7 +2100,9 @@
           remark: '',
           mesUser: this.$store.state.user.name,
           itemList: [],
-          checkResult: '',
+          isReturn: row.isReturn,
+          checkResult: row.checkResult,
+          disposalMeasures: row.disposalMeasures,
           operator: row.operator,
           operatorName: row.operatorName,
           functionType: 'B',
@@ -2131,6 +2144,7 @@
           }
         }
         this.saveData.itemList = JSON.parse(JSON.stringify(this.detailList))
+        console.log(this.saveData)
         await saveCheckOrderReport(this.saveData).then(({data}) => {
           if (data && data.code === 0) {
             this.getDataList()