From b16e1d0f5764ed4168510368467f9d6017cf656e Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Thu, 17 Mar 2022 11:44:49 +0800
Subject: [PATCH] sxm 2022-3-15

---
 src/api/yieldReport/com_finish_roll.js        |  4 ++
 src/views/modules/sys/language/common.vue     | 51 +++++++++++++++----
 .../modules/yieldReport/com_finish_roll.vue   | 18 ++++++-
 .../yieldReport/not_over_finish_roll.vue      | 21 +++++++-
 .../otherReport/fqc_produce_report_normal.vue | 10 ++--
 .../modules/yieldReport/produce_order.vue     | 44 ++++++++++++++--
 6 files changed, 127 insertions(+), 21 deletions(-)

diff --git a/src/api/yieldReport/com_finish_roll.js b/src/api/yieldReport/com_finish_roll.js
index 107e72d..20f9539 100644
--- a/src/api/yieldReport/com_finish_roll.js
+++ b/src/api/yieldReport/com_finish_roll.js
@@ -39,6 +39,10 @@ export const checkFinishRollWithNoFqc = data => createAPI('schedule/checkFinishR
 // 结束卷的操作
 export const finishRollWithNoFqc = data => createAPI('schedule/finishRollWithNoFqc', 'POST', data)
 
+// 校验是否可以修改总良品数
+export const getSORoutingPreviousOperationItemNo = data => createAPI('schedule/getSORoutingPreviousOperationItemNo', 'POST', data)
+
+
 
 
 
diff --git a/src/views/modules/sys/language/common.vue b/src/views/modules/sys/language/common.vue
index 6746764..4a185d4 100644
--- a/src/views/modules/sys/language/common.vue
+++ b/src/views/modules/sys/language/common.vue
@@ -1,5 +1,6 @@
 <template>
-  <div class="mod-config">
+  <div  class="hello">
+
     <el-row>
       <el-col :span="24">
         <div>
@@ -39,6 +40,7 @@
         </el-form>
       </el-col>
       <el-col :span="24">
+
         <el-table
           id="commmon"
           :height="height"
@@ -70,12 +72,14 @@
             width="150"
             :label="buttons.cz">
             <template slot-scope="scope">
-              <a type="text" size="small" @click="addOrUpdateLanguageList(scope.row.functionId)">{{ buttons.settingLanguageList }}
+              <a type="text" size="small"
+                 @click="addOrUpdateLanguageList(scope.row.functionId)">{{ buttons.settingLanguageList }}
               </a>
               |
-              <a type="text" size="small"  @click="addOrUpdateLanguage(scope.row)">{{ buttons.settingLanguage }}</a>
+              <a type="text" size="small" @click="addOrUpdateLanguage(scope.row)">{{ buttons.settingLanguage }}</a>
             </template>
           </el-table-column>
+
         </el-table>
         <el-pagination
           @size-change="sizeChangeHandle"
@@ -93,11 +97,14 @@
     <!--  语言组件   -->
     <commonLanguageBase ref="commonLanguageAdd" v-drag></commonLanguageBase>
     <commonLanguageList ref="commonLanguageList" v-drag></commonLanguageList>
+    <context-button v-if="menuVisible" @foo="foo" ref="contextbutton" @handleOne="handleOne" @handleTwo="handleTwo"
+                    @handleThree="handleThree"></context-button>
   </div>
 </template>
 
 <script>
 import column from "../../common/column";
+import contextButton from '../../common/right_click_menu'
 import commonLanguageBase from "./common-language-base";
 import commonLanguageList from "./common-language-list";
 import {
@@ -126,10 +133,12 @@ export default {
   components: {
     column,
     commonLanguageBase,
-    commonLanguageList
+    commonLanguageList,
+    contextButton
   },
   data() {
     return {
+      menuVisible: false,
       listShow: false,
       // table高度
       height: 450,
@@ -530,7 +539,7 @@ export default {
   // },
   mounted() {
     this.$nextTick(() => {
-      this.heigquerySysLanguagePackht = window.innerHeight - 180;
+      this.height = window.innerHeight - 180;
     })
   },
   activated() {
@@ -538,6 +547,30 @@ export default {
     //this.getLanguageList()
   },
   methods: {
+    rowContextmenu(row, column, event) {
+      this.menuVisible = false
+      this.menuVisible = true
+      // 阻止右键默认行为
+      event.preventDefault()
+      this.$nextTick(() => {
+        this.$refs.contextbutton.init(row, column, event)
+      })
+    },
+    foo() { // 取消鼠标监听事件 菜单栏
+      this.menuVisible = false
+      document.removeEventListener('click', this.foo)
+    },
+    handleOne() {
+      console.log('点击菜单一')
+    },
+
+    handleTwo() {
+      console.log('点击菜单二')
+    },
+    handleThree() {
+      console.log('点击菜单三')
+    },
+
     // 校验用户是否收藏
     favoriteIsOk() {
       let userFavorite = {
@@ -658,13 +691,13 @@ export default {
       // 删除所有的该页面下保存的数据
       if (this.userColumnList) {
         //删除 user自定义的数据
-       await removerUser(this.queryTable)
+        await removerUser(this.queryTable)
       }
       // 删除默认配置
       await removerDefault(this.queryTable)
       // 保存页面 table属性
       let sumColumnList = this.columnList.concat(this.columnList1);
-      sumColumnList = sumColumnList.map(item=> {
+      sumColumnList = sumColumnList.map(item => {
         return item = {
           tableId: item.tableId,
           tableName: item.tableName,
@@ -685,9 +718,9 @@ export default {
         }
       })
 
-      await  saveTableDefaultList(sumColumnList)
+      await saveTableDefaultList(sumColumnList)
       // 保存页面 button label title 属性
-      let buttons = this.buttonList.map( item => {
+      let buttons = this.buttonList.map(item => {
         return item = {
           functionId: this.$route.meta.menuId,
           languageValue: item.languageValue,
diff --git a/src/views/modules/yieldReport/com_finish_roll.vue b/src/views/modules/yieldReport/com_finish_roll.vue
index d6dcf20..fe2678a 100644
--- a/src/views/modules/yieldReport/com_finish_roll.vue
+++ b/src/views/modules/yieldReport/com_finish_roll.vue
@@ -46,7 +46,7 @@
               <el-input v-model="pageData.approvedQty" @blur="checkValidApprovedQty" type="number" style="width: 80px;" ></el-input>
             </el-form-item>
             <el-form-item class="customer-item" label="总不良品数量:" style="margin-top: -10px;">
-              <el-input v-model="pageData.defectedQty" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
+              <el-input v-model="pageData.defectedQty" :disabled="showNumFlag" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
             </el-form-item>
             <el-form-item class="customer-item" label="总数量" style="margin-top: -10px;">
               <el-input v-model="pageData.totalQty" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
@@ -238,7 +238,8 @@ import {
   getSfdcReportedData,
   getSfdcMaterialByRollNo,
   checkFinishRollWithNoFqc,
-  finishRollWithNoFqc
+  finishRollWithNoFqc,
+  getSORoutingPreviousOperationItemNo
 } from '@/api/yieldReport/com_finish_roll.js';
 export default {
   name: "com_finish_roll",
@@ -246,6 +247,7 @@ export default {
     return {
       titleCon: '结束卷',
       showExceptionFlag: false,
+      showNumFlag:false,
       sfdcTimeList: [],
       scheduleData: {
         site: this.$store.state.user.site,
@@ -510,6 +512,18 @@ export default {
     comExceptionReason,/*异常原因的组件*/
   },
   methods: {
+    sORoutingPreviousOperationItemNo(){
+      getSORoutingPreviousOperationItemNo( this.pageData).then(({data})=>{
+        if (data.code==0){
+          if (data.itemNo>0){
+            this.showNumFlag = true
+          }else {
+            this.showNumFlag = false
+          }
+        }
+      })
+
+    },
     /*初始化页面参数*/
     init(scheduleData, operatorData) {
       //初始化参数
diff --git a/src/views/modules/yieldReport/not_over_finish_roll.vue b/src/views/modules/yieldReport/not_over_finish_roll.vue
index ad3514c..62fa4fa 100644
--- a/src/views/modules/yieldReport/not_over_finish_roll.vue
+++ b/src/views/modules/yieldReport/not_over_finish_roll.vue
@@ -61,7 +61,7 @@
             </el-form-item>
             <el-form-item class="customer-item" label="总良品数量:" style="margin-top: -10px;">
               <!--<el-input v-model="pageData.approvedQty" type="number"  @blur="checkValidApprovedQty"-->
-              <el-input v-model="pageData.approvedQty" @blur="checkValidApprovedQty" type="number" style="width: 80px;" ></el-input>
+              <el-input v-model="pageData.approvedQty" :disabled="showNumFlag" @blur="checkValidApprovedQty" type="number" style="width: 80px;" ></el-input>
             </el-form-item>
             <el-form-item class="customer-item" label="总不良品数量:" style="margin-top: -10px;">
               <el-input v-model="pageData.defectedQty" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
@@ -246,13 +246,15 @@ import {
   getSfdcReportedData,
   getSfdcMaterialByRollNo,
   checkFinishRollWithNoFqc,
-  finishRollWithNoFqc
+  finishRollWithNoFqc,
+  getSORoutingPreviousOperationItemNo
 } from '@/api/yieldReport/com_finish_roll.js';
 export default {
   data() {
     return {
       titleCon: '结束卷',
       showExceptionFlag: false,
+      showNumFlag: false,
       sfdcTimeList: [],
       scheduleData: {
         site: this.$store.state.user.site,
@@ -518,6 +520,19 @@ export default {
     comExceptionReason,/*异常原因的组件*/
   },
   methods: {
+    sORoutingPreviousOperationItemNo(){
+
+      getSORoutingPreviousOperationItemNo( this.pageData).then(({data})=>{
+        if (data.code==0){
+          if (data.itemNo>0){
+            this.showNumFlag = true
+          }else {
+            this.showNumFlag = false
+          }
+        }
+      })
+
+    },
     /*初始化页面参数*/
     init(scheduleData, operatorData) {
       //初始化参数
@@ -543,9 +558,11 @@ export default {
       this.pageData.exceptionReason =  '';
       //刷新当前派工单的信息
       this.refreshPageData();
+      this.sORoutingPreviousOperationItemNo()
     },
     /*关闭modal*/
     closeDialog(){
+      Object.assign(this.$data, this.$options.data.call(this));
       //刷新报工的页面
       this.$emit('refreshPageData');
       //关闭当前的页面
diff --git a/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue b/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue
index 6ad79eb..ab1496e 100644
--- a/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue
@@ -3257,12 +3257,14 @@ export default {
         //判断操作是否成功
         if (data.code == 500) {
           this.$message.error(data.msg);
-        } else {
+        } else if (data.code == 200) {
+          this.$message.success(data.msg)
           //刷新报工的页面
-          this.$emit('refreshPageData');
-          //关闭当前的页面
-          this.closeDialog();
+          this.getSfdcRollList()
+        }else {
+          this.$message.warning(data.msg)
         }
+
       })
     },
     /*结束卷操作*/
diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue
index b444fa6..1fc086f 100644
--- a/src/views/modules/yieldReport/produce_order.vue
+++ b/src/views/modules/yieldReport/produce_order.vue
@@ -75,9 +75,20 @@
       </el-form-item>
     </el-form>
     <!--  查询时间和产品  -->
-    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 5px;">
+    <el-form :inline="true"  label-position="top" label-width="100px">
       <el-form-item >
-        <el-input v-model="searchData.site" style="width: 85px"></el-input>
+        <el-dropdown class="customer-dropdown" @command="handleCommand">
+          <el-button type="primary">
+            主菜单<i class="el-icon-arrow-down el-icon--right"></i>
+          </el-button>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item class="customer-li"  command="0"  :disable="menuButton.prdButton" >生产订单</el-dropdown-item>
+            <el-dropdown-item class="customer-li"  command="1" disabled >关闭</el-dropdown-item>
+            <el-dropdown-item class="customer-li"  command="1" disabled >打开</el-dropdown-item>
+            <el-dropdown-item class="customer-li"  command="1" disabled >暂停</el-dropdown-item>
+            <el-dropdown-item class="customer-li"  command="1" disabled >重新开工</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
       </el-form-item>
     </el-form>
     <!--  工单主表信息  -->
@@ -969,6 +980,9 @@ export default {
           fixed: false
         }
       ],
+      menuButton:{
+        prdButton:true
+      }
     }
   },
   components: {
@@ -981,11 +995,29 @@ export default {
   },
   mounted() {
     this.$nextTick(() => {
-      this.height = window.innerHeight - 225;
+      this.height = window.innerHeight - 235;
     })
   },
   methods: {
+    /*区分不同的菜单  调用不同的方法  调用不同的方法*/
+    handleCommand(val){
+      if (JSON.stringify(this.currentRow) == '{}') {
+        this.menuButton.prdButton = false
+      }
+      //区分是哪一个方法调用
+      if('0' == val){
+        if (JSON.stringify(this.currentRow) == '{}') {
+          this.$message.error('请先选择派工单!');
+          return false;
+        }
+        this.$router.push('/shopOrder-shopOrder/shopOrder',this.currentRow.orderNo)
+      }
+      if('1' == val){
+        //调用提示的方法
+        this.warnReScheduleConfirm();
+      }
 
+    },
     // FQC 报工
     fqcReportModal(){
       //首先判断是否选择好派工单
@@ -1298,6 +1330,10 @@ div.customer-el-card-blue {
 .customer-css .el-button--medium {
   padding: 5px 5px;
 }
-
+/*添加主菜单和明细菜单的样式*/
+.customer-css .customer-dropdown .el-button--primary{
+  padding: 2px;
+  font-size: 12px;
+}
 /*控制上下间距*/
 </style>