Merge branch 'master' of http://git.dongkesoft.com:9001/DK-MES-3.0/mes-web

src/view-app/app/piecework-procedure/finish-check/index.vue

@@ -6,104 +6,50 @@
 
 
     <!-- 选择工位 -->
-    <dk-app-field
-      v-if="stationList.length>0"
-      v-model="formData.stationName"
-      :label="$t('stationName')"
-      :readonly="true"
-      @click="showStation = true"
-      placeholderType="choose" is-link arrow-direction="down"
-    />
+    <dk-app-field v-if="stationList.length > 0" v-model="formData.stationName" :label="$t('stationName')" :readonly="true"
+      @click="showStation = true" placeholderType="choose" is-link arrow-direction="down" />
     <!--  生产工号-->
-    <dk-app-field
-      v-model="formData.prodUserCode"
-
-      ref="prodUser"
-      :readonly="prodUserCodeFlag"
-      :label="$t('appProductionJobNumber')"
-      placeholderType="scan"
-      @changeBarCode="queryUser"/>
+    <dk-app-field v-model="formData.prodUserCode" ref="prodUser" :readonly="prodUserCodeFlag"
+      :label="$t('appProductionJobNumber')" placeholderType="scan" @changeBarCode="queryUser" />
     <!--    产品条码-->
-    <dk-app-field
-      :label="$t('appProductCode')"
-      ref="barCode"
-      v-model="formData.barCode"
-      @changeBarCode="queryBarCode"
-      :readonly="(formData.prodUserCode.length == 0)"
-      placeholderType="scan"></dk-app-field>
+    <dk-app-field :label="$t('appProductCode')" ref="barCode" v-model="formData.barCode" @changeBarCode="queryBarCode"
+      :readonly="(formData.prodUserCode.length == 0)" placeholderType="scan"></dk-app-field>
     <div style="height: 15px;background: #f8f9fd;"></div>
     <div v-if="this.formData.uniqueCode" class="app-form">
       <div class="app-form-main">
         <!--    产品编码-->
-        <dk-app-field
-          v-model="formData.uniqueCode"
-          :label="$t('appProductCodeB')"
-          :readonly="true"
-          :placeholderFlag="false"
-        />
+        <dk-app-field v-model="formData.uniqueCode" :label="$t('appProductCodeB')" :readonly="true"
+          :placeholderFlag="false" />
         <!--    产品名称-->
-        <dk-app-field
-          v-model="formData.modelName"
-          :label="$t('appProductName')"
-          :readonly="true"
-          :placeholderFlag="false"
-        />
+        <dk-app-field v-model="formData.modelName" :label="$t('appProductName')" :readonly="true"
+          :placeholderFlag="false" />
         <!--    商标名称-->
-        <dk-app-field
-          v-model="formData.logoName"
-          :label="$t('appLogoName')"
-          :readonly="true"
-          :placeholderFlag="false"
-        />
+        <dk-app-field v-model="formData.logoName" :label="$t('appLogoName')" :readonly="true" :placeholderFlag="false" />
         <!--    釉色名称-->
-        <dk-app-field
-          v-model="formData.colourName"
-          :label="$t('appColourName')"
-          :readonly="true"
-          :placeholderFlag="false"
-        />
+        <dk-app-field v-model="formData.colourName" :label="$t('appColourName')" :readonly="true"
+          :placeholderFlag="false" />
         <!--    产品分级-->
-        <dk-app-field
-          v-model="formData.gradeKindName"
-          :label="$t('appProductClassification')"
-          :readonly="true"
-          @click="openDropdown({key:'productClassification'})"
-          placeholderType="choose" is-link arrow-direction="down"
-        />
+        <dk-app-field v-model="formData.gradeKindName" :label="$t('appProductClassification')" :readonly="true"
+          @click="openDropdown({ key: 'productClassification' })" placeholderType="choose" is-link arrow-direction="down" />
         <!--    缺陷号-->
-        <dk-app-field v-if="defectFlag"
-                      v-model="formData.defectNo"
-                      ref="defectNo"
-                      :label="$t('appDefectCode')"
-                      :readonly="readonlyFlag"
-                      @changeBarCode="getCheckNodeDefectCode"
-        />
+        <dk-app-field v-if="defectFlag" v-model="formData.defectNo" ref="defectNo" :label="$t('appDefectCode')"
+          :readonly="readonlyFlag" @changeBarCode="getCheckNodeDefectCode" />
         <!--    缺陷名称-->
-        <dk-app-field v-if="defectFlag"
-                      v-model="formData.defectNoName"
-                      :label="$t('appDefectNoName')"
-                      :readonly="true"
-                      :placeholderFlag="false"/>
+        <dk-app-field v-if="defectFlag" v-model="formData.defectNoName" :label="$t('appDefectNoName')" :readonly="true"
+          :placeholderFlag="false" />
       </div>
     </div>
 
 
     <div v-if="tableRowData.length > 0" style="margin: 10px">{{ $t('appDefectInformation') }}</div>
     <!--    缺陷信息 list-->
-    <dk-app-table :rows="rows" v-if="tableRowData.length > 0"
-                  :disabledSwipe="false"
-                  :tableRowData="tableRowData"
-                  @onItemRowDelClick="onItemRowDelClick"
-                  @openDropdown="openDropdown">
+    <dk-app-table :rows="rows" v-if="tableRowData.length > 0" :disabledSwipe="false" :tableRowData="tableRowData"
+      @onItemRowDelClick="onItemRowDelClick" @openDropdown="openDropdown">
     </dk-app-table>
     <div v-if="productionDefectList.length > 0" style="margin: 10px">{{ $t('appDefectInformationDetail') }}</div>
     <!--    历史缺陷明细-->
     <dk-app-table :rows="productionDefectListRows" v-if="productionDefectList.length > 0"
-                  :tableRowData="productionDefectList"
-                  @onItemRowDelClick="onItemRowDelClickDefectList"
-
-                  :disabledSwipe="false"
-    >
+      :tableRowData="productionDefectList" @onItemRowDelClick="onItemRowDelClickDefectList" :disabledSwipe="false">
     </dk-app-table>
     <!--  保存按钮-->
     <div class="app_save_bottom-class" style="display: flex">
@@ -116,15 +62,13 @@
     </div>
 
     <!--    产品分级-->
-    <dk-app-single-dropdown typeName="productClassification" :show="sideProductClassificationFlag"
-                            :getDataInItFlag="true"
-                            @mutiClose="singleClose('productClassification')" :flowNodeId="formData.flowNodeId"
-                            :ids="[formData.gradeKindId]"
-                            @mutiCommit="singleCommit($event,'productClassification')"></dk-app-single-dropdown>
+    <dk-app-single-dropdown typeName="productClassification" :show="sideProductClassificationFlag" :getDataInItFlag="true"
+      @mutiClose="singleClose('productClassification')" :flowNodeId="formData.flowNodeId" :ids="[formData.gradeKindId]"
+      @mutiCommit="singleCommit($event, 'productClassification')"></dk-app-single-dropdown>
     <!--   工位 -->
     <dk-app-single-dropdown typeName="register" :show="showStation" :flowNodeId="formData.flowNodeId"
-                            @mutiClose="mutiClose('register')" :ids="[formData.stationId]"
-                            @mutiCommit="mutiCommit($event,'register')"></dk-app-single-dropdown>
+      @mutiClose="mutiClose('register')" :ids="[formData.stationId]"
+      @mutiCommit="mutiCommit($event, 'register')"></dk-app-single-dropdown>
     <!-- 加载页面   -->
     <dk-app-loading :loading="loading"></dk-app-loading>
   </div>
@@ -132,7 +76,7 @@
 
 <script>
 
-import {appFormMixin} from '@/mixins/appform.js'
+import { appFormMixin } from '@/mixins/appform.js'
 
 export default {
   name: "app-half-check",
@@ -140,6 +84,7 @@ export default {
   data() {
     let self = this
     return {
+      gradeFlag: null,
       stationList: [],      //工位list数据源
       showStation: false,
       readonlyFlag: true, //只读标识
@@ -149,29 +94,29 @@ export default {
       productionDefectDelIdList: [],//删除
       //每一条的内容
       rows: [
-        {name: 'defectNo', title: self.$t('appDefectCode')},//缺陷编码
-        {name: 'defectNoName', title: self.$t('appDefectNoName')},//缺陷名称
-        {name: 'defectNo', title: self.$t('appDefectDeduction')},//缺陷扣罚
-        {name: 'deductNum', title: self.$t('appDeduction')},//扣除数
-        {name: 'placeCode', title: self.$t('appDefectName')},//缺陷位置
-        {name: 'responsibleProcess', title: self.$t('appResponsibleProcess')},//责任工序
-        {name: 'userName', title: self.$t('appResponsibleJobNumber')},//责任工号
-        {name: 'jobName', title: self.$t('appPersonJobName')},//责任工种
-        {name: 'staffNames', title: self.$t('appPersonLiableMan')},//责任员工
+        { name: 'defectNo', title: self.$t('appDefectCode') },//缺陷编码
+        { name: 'defectNoName', title: self.$t('appDefectNoName') },//缺陷名称
+        { name: 'defectNo', title: self.$t('appDefectDeduction') },//缺陷扣罚
+        { name: 'deductNum', title: self.$t('appDeduction') },//扣除数
+        { name: 'placeCode', title: self.$t('appDefectName') },//缺陷位置
+        { name: 'responsibleProcess', title: self.$t('appResponsibleProcess') },//责任工序
+        { name: 'userName', title: self.$t('appResponsibleJobNumber') },//责任工号
+        { name: 'jobName', title: self.$t('appPersonJobName') },//责任工种
+        { name: 'staffNames', title: self.$t('appPersonLiableMan') },//责任员工
 
 
       ],
       tableRowData: [],
       productionDefectListRows: [
-        {name: 'pdtDefectCode', title: self.$t('appDefectCode')},//缺陷编码
-        {name: 'pdtDefectName', title: self.$t('appDefectNoName')},//缺陷名称
-        {name: 'dftFineName', title: self.$t('appDefectDeduction')},//缺陷扣罚
-        {name: 'deductNum', title: self.$t('appDeduction')},//扣除数
-        {name: 'pdtPlaceName', title: self.$t('appDefectName')},//缺陷位置
-        {name: 'blameNodeName', title: self.$t('appResponsibleProcess')},//责任工序
-        {name: 'blameUserName', title: self.$t('appResponsibleJobNumber')},//责任工号
-        {name: 'blameJobName', title: self.$t('appPersonJobName')},//责任工种
-        {name: 'blameStaffName', title: self.$t('appPersonLiableMan')},//责任员工
+        { name: 'pdtDefectCode', title: self.$t('appDefectCode') },//缺陷编码
+        { name: 'pdtDefectName', title: self.$t('appDefectNoName') },//缺陷名称
+        { name: 'dftFineName', title: self.$t('appDefectDeduction') },//缺陷扣罚
+        { name: 'deductNum', title: self.$t('appDeduction') },//扣除数
+        { name: 'pdtPlaceName', title: self.$t('appDefectName') },//缺陷位置
+        { name: 'blameNodeName', title: self.$t('appResponsibleProcess') },//责任工序
+        { name: 'blameUserName', title: self.$t('appResponsibleJobNumber') },//责任工号
+        { name: 'blameJobName', title: self.$t('appPersonJobName') },//责任工种
+        { name: 'blameStaffName', title: self.$t('appPersonLiableMan') },//责任员工
       ],
       productionDefectList: [],
       productionDefectListTemp: [],
@@ -271,7 +216,7 @@ export default {
      */
     queryBarCode() {
       if (!this.formData.stationName && this.stationIdFlag) {
-        this.appToastFail(this.$t('selectWords', {'search-name': this.$t('stationName')}))
+        this.appToastFail(this.$t('selectWords', { 'search-name': this.$t('stationName') }))
         return
       }
       let params = {
@@ -321,7 +266,7 @@ export default {
         if (res.code === this.$config.SUCCESS_CODE) {
           this.opnKind = res.data.opnKind
           if (res.data.userKind == null) { // 验证 此工序无此用户
-            this.$appDialog.alert({message: this.$t('W_117'),}).then(() => {
+            this.$appDialog.alert({ message: this.$t('W_117'), }).then(() => {
               // 弹出alert后的逻辑处理
               if (this.handleExcuteAlert) {
               }
@@ -464,11 +409,11 @@ export default {
      */
     onRouterRecordProcess() {
       if (!this.formData.uniqueCode) {
-        this.appToastFail(this.$t('inputWords', {'search-name': this.$t('appProductCode')}))
+        this.appToastFail(this.$t('inputWords', { 'search-name': this.$t('appProductCode') }))
         return false;
       }
       if (!this.formData.defectNo) { //缺陷编码
-        this.appToastFail(this.$t('inputWords', {'search-name': this.$t('appDefectCode')}))
+        this.appToastFail(this.$t('inputWords', { 'search-name': this.$t('appDefectCode') }))
         return false;
       }
       // if (!this.formData.defectId) { //验证缺陷编码
@@ -577,12 +522,16 @@ export default {
         this.appToastFail((this.$t('appProductionJobNumbeWrong')));
         return false;
       }
+      if (!this.gradeFlag) {
+        this.appToastFail(this.$t('W_131'))
+        return false
+      }
       if (!this.formData.uniqueCode) {  //产品条码
-        this.appToastFail(this.$t('inputWords', {'search-name': this.$t('appProductCode')}))
+        this.appToastFail(this.$t('inputWords', { 'search-name': this.$t('appProductCode') }))
         return false;
       }
       if (!this.formData.gradeKindId) {  //产品等级
-        this.appToastFail(this.$t('selectWords', {'search-name': this.$t('appProductGrade')}))
+        this.appToastFail(this.$t('selectWords', { 'search-name': this.$t('appProductGrade') }))
         return false;
       }
       if (this.formData.defectNo) { //缺陷编码
@@ -670,6 +619,8 @@ export default {
     //this.setAppTableHeight(0)
   },
   activated() {
+    //改判权限
+    this.gradeFlag = this.$libaray.checkButtonHasRight('half-check-recharge')
     //读缓存
     if (localStorage.getItem("app-record-process-data") !== null) {
       let data = JSON.parse(localStorage.getItem("app-record-process-data")) || []

src/view-app/app/piecework-procedure/half-check/index.vue

@@ -5,106 +5,53 @@
     <dk-app-nav-bar :title="appActiveTitle" @click-left="onClickLeft"></dk-app-nav-bar>
 
     <!-- 选择工位 -->
-    <dk-app-field
-      v-if="stationList.length>0"
-      v-model="formData.stationName"
-      :label="$t('stationName')"
-      :readonly="true"
-      @click="showStation = true"
-      placeholderType="choose" is-link arrow-direction="down"
-    />
+    <dk-app-field v-if="stationList.length > 0" v-model="formData.stationName" :label="$t('stationName')" :readonly="true"
+      @click="showStation = true" placeholderType="choose" is-link arrow-direction="down" />
 
 
     <!--  生产工号-->
-    <dk-app-field
-      v-model="formData.prodUserCode"
-      ref="prodUser"
-      :readonly="prodUserCodeFlag"
-      :label="$t('appProductionJobNumber')"
-      placeholderType="scan"
-      @changeBarCode="queryUser"/>
+    <dk-app-field v-model="formData.prodUserCode" ref="prodUser" :readonly="prodUserCodeFlag"
+      :label="$t('appProductionJobNumber')" placeholderType="scan" @changeBarCode="queryUser" />
     <!--    产品条码-->
-    <dk-app-field
-      :label="$t('appProductCode')"
-      ref="barCode"
-      v-model="formData.barCode"
-      @changeBarCode="queryBarCode"
-      :readonly="(formData.prodUserCode.length == 0)"
-      placeholderType="scan"></dk-app-field>
+    <dk-app-field :label="$t('appProductCode')" ref="barCode" v-model="formData.barCode" @changeBarCode="queryBarCode"
+      :readonly="(formData.prodUserCode.length == 0)" placeholderType="scan"></dk-app-field>
 
     <div style="height: 15px;background: #f8f9fd;"></div>
     <div v-if="this.formData.uniqueCode" class="app-form">
       <div class="app-form-main">
         <!--    产品编码-->
-        <dk-app-field
-          v-model="formData.uniqueCode"
-          :label="$t('appProductCodeB')"
-          :readonly="true"
-          :placeholderFlag="false"
-        />
+        <dk-app-field v-model="formData.uniqueCode" :label="$t('appProductCodeB')" :readonly="true"
+          :placeholderFlag="false" />
         <!--    产品名称-->
-        <dk-app-field
-          v-model="formData.modelName"
-          :label="$t('appProductName')"
-
-          :readonly="true"
-          :placeholderFlag="false"
-        />
+        <dk-app-field v-model="formData.modelName" :label="$t('appProductName')" :readonly="true"
+          :placeholderFlag="false" />
         <!--    商标名称-->
-        <dk-app-field
-          v-model="formData.logoName"
-          :label="$t('appLogoName')"
-          :readonly="true"
-          :placeholderFlag="false"
-        />
+        <dk-app-field v-model="formData.logoName" :label="$t('appLogoName')" :readonly="true" :placeholderFlag="false" />
         <!--    釉色名称-->
-        <dk-app-field
-          v-model="formData.colourName"
-          :label="$t('appColourName')"
-          :readonly="true"
-          :placeholderFlag="false"
-        />
+        <dk-app-field v-model="formData.colourName" :label="$t('appColourName')" :readonly="true"
+          :placeholderFlag="false" />
         <!--    产品分级-->
-        <dk-app-field
-          v-model="formData.gradeKindName"
-          :label="$t('appProductClassification')"
-          :readonly="true"
-          @click="openDropdown({key:'productClassification'})"
-          placeholderType="choose" is-link arrow-direction="down"
-        />
+        <dk-app-field v-model="formData.gradeKindName" :label="$t('appProductClassification')" :readonly="true"
+          @click="openDropdown({ key: 'productClassification' })" placeholderType="choose" is-link arrow-direction="down" />
         <!--    缺陷号-->
-        <dk-app-field v-if="defectFlag"
-                      v-model="formData.defectNo"
-                      ref="defectNo"
-                      :label="$t('appDefectCode')"
-                      :readonly="readonlyFlag"
-                      @changeBarCode="getCheckNodeDefectCode"
-        />
+        <dk-app-field v-if="defectFlag" v-model="formData.defectNo" ref="defectNo" :label="$t('appDefectCode')"
+          :readonly="readonlyFlag" @changeBarCode="getCheckNodeDefectCode" />
         <!--    缺陷名称-->
-        <dk-app-field v-if="defectFlag"
-                      v-model="formData.defectNoName"
-                      :label="$t('appDefectNoName')"
-                      :readonly="true"
-                      :placeholderFlag="false"/>
+        <dk-app-field v-if="defectFlag" v-model="formData.defectNoName" :label="$t('appDefectNoName')" :readonly="true"
+          :placeholderFlag="false" />
       </div>
-    </div  >
+    </div>
 
 
     <div v-if="tableRowData.length > 0" style="margin: 10px">{{ $t('appDefectInformation') }}</div>
     <!--    缺陷信息 list-->
-    <dk-app-table :rows="rows" v-if="tableRowData.length > 0"
-                  :tableRowData="tableRowData"
-                  :disabledSwipe="false"
-                  @onItemRowDelClick="onItemRowDelClick"
-                  @openDropdown="openDropdown">
+    <dk-app-table :rows="rows" v-if="tableRowData.length > 0" :tableRowData="tableRowData" :disabledSwipe="false"
+      @onItemRowDelClick="onItemRowDelClick" @openDropdown="openDropdown">
     </dk-app-table>
     <div v-if="productionDefectList.length > 0" style="margin: 10px">{{ $t('appDefectInformationDetail') }}</div>
     <!--    历史缺陷明细-->
     <dk-app-table :rows="productionDefectListRows" v-if="productionDefectList.length > 0"
-                  :tableRowData="productionDefectList"
-                  :disabledSwipe="false"
-                  @onItemRowDelClick="onItemRowDelClickDefectList"
-    >
+      :tableRowData="productionDefectList" :disabledSwipe="false" @onItemRowDelClick="onItemRowDelClickDefectList">
     </dk-app-table>
 
 
@@ -119,16 +66,14 @@
     </div>
 
     <!--    产品分级-->
-    <dk-app-single-dropdown typeName="productClassification" :show="sideProductClassificationFlag"
-                            :getDataInItFlag="true"
-                            @mutiClose="singleClose('productClassification')" :flowNodeId="formData.flowNodeId"
-                            :ids="[formData.gradeKindId]"
-                            @mutiCommit="singleCommit($event,'productClassification')"></dk-app-single-dropdown>
+    <dk-app-single-dropdown typeName="productClassification" :show="sideProductClassificationFlag" :getDataInItFlag="true"
+      @mutiClose="singleClose('productClassification')" :flowNodeId="formData.flowNodeId" :ids="[formData.gradeKindId]"
+      @mutiCommit="singleCommit($event, 'productClassification')"></dk-app-single-dropdown>
 
     <!--   工位 -->
     <dk-app-single-dropdown typeName="register" :show="showStation" :flowNodeId="formData.flowNodeId"
-                            @mutiClose="mutiClose('register')" :ids="[formData.stationId]"
-                            @mutiCommit="mutiCommit($event,'register')"></dk-app-single-dropdown>
+      @mutiClose="mutiClose('register')" :ids="[formData.stationId]"
+      @mutiCommit="mutiCommit($event, 'register')"></dk-app-single-dropdown>
     <!-- 加载页面   -->
     <dk-app-loading :loading="loading"></dk-app-loading>
   </div>
@@ -136,7 +81,7 @@
 
 <script>
 
-import {appFormMixin} from '@/mixins/appform.js'
+import { appFormMixin } from '@/mixins/appform.js'
 
 export default {
   name: "app-half-check",
@@ -144,6 +89,7 @@ export default {
   data() {
     let self = this
     return {
+      gradeFlag: null,
       stationList: [],      //工位list数据源
       showStation: false,
       readonlyFlag: true, //只读标识
@@ -152,29 +98,29 @@ export default {
       sideProductClassificationFlag: false,   //产品分级标识
       //每一条的内容
       rows: [
-        {name: 'defectNo', title: self.$t('appDefectCode')},//缺陷编码
-        {name: 'defectNoName', title: self.$t('appDefectNoName')},//缺陷名称
-        {name: 'defectNo', title: self.$t('appDefectDeduction')},//缺陷扣罚
-        {name: 'deductNum', title: self.$t('appDeduction')},//扣除数
-        {name: 'placeCode', title: self.$t('appDefectName')},//缺陷位置
-        {name: 'responsibleProcess', title: self.$t('appResponsibleProcess')},//责任工序
-        {name: 'userName', title: self.$t('appResponsibleJobNumber')},//责任工号
-        {name: 'jobName', title: self.$t('appPersonJobName')},//责任工种
-        {name: 'staffNames', title: self.$t('appPersonLiableMan')},//责任员工
+        { name: 'defectNo', title: self.$t('appDefectCode') },//缺陷编码
+        { name: 'defectNoName', title: self.$t('appDefectNoName') },//缺陷名称
+        { name: 'defectNo', title: self.$t('appDefectDeduction') },//缺陷扣罚
+        { name: 'deductNum', title: self.$t('appDeduction') },//扣除数
+        { name: 'placeCode', title: self.$t('appDefectName') },//缺陷位置
+        { name: 'responsibleProcess', title: self.$t('appResponsibleProcess') },//责任工序
+        { name: 'userName', title: self.$t('appResponsibleJobNumber') },//责任工号
+        { name: 'jobName', title: self.$t('appPersonJobName') },//责任工种
+        { name: 'staffNames', title: self.$t('appPersonLiableMan') },//责任员工
 
 
       ],
 
       productionDefectListRows: [
-        {name: 'pdtDefectCode', title: self.$t('appDefectCode')},//缺陷编码
-        {name: 'pdtDefectName', title: self.$t('appDefectNoName')},//缺陷名称
-        {name: 'dftFineName', title: self.$t('appDefectDeduction')},//缺陷扣罚
-        {name: 'deductNum', title: self.$t('appDeduction')},//扣除数
-        {name: 'pdtPlaceName', title: self.$t('appDefectName')},//缺陷位置
-        {name: 'blameNodeName', title: self.$t('appResponsibleProcess')},//责任工序
-        {name: 'blameUserName', title: self.$t('appResponsibleJobNumber')},//责任工号
-        {name: 'blameJobName', title: self.$t('appPersonJobName')},//责任工种
-        {name: 'blameStaffName', title: self.$t('appPersonLiableMan')},//责任员工
+        { name: 'pdtDefectCode', title: self.$t('appDefectCode') },//缺陷编码
+        { name: 'pdtDefectName', title: self.$t('appDefectNoName') },//缺陷名称
+        { name: 'dftFineName', title: self.$t('appDefectDeduction') },//缺陷扣罚
+        { name: 'deductNum', title: self.$t('appDeduction') },//扣除数
+        { name: 'pdtPlaceName', title: self.$t('appDefectName') },//缺陷位置
+        { name: 'blameNodeName', title: self.$t('appResponsibleProcess') },//责任工序
+        { name: 'blameUserName', title: self.$t('appResponsibleJobNumber') },//责任工号
+        { name: 'blameJobName', title: self.$t('appPersonJobName') },//责任工种
+        { name: 'blameStaffName', title: self.$t('appPersonLiableMan') },//责任员工
       ],
       tableRowData: [],
       productionDefectList: [],
@@ -258,7 +204,7 @@ export default {
       }
       this.excute(this.$service.appCollectService, this.$service.appCollectService.checkProdUserCode, params, 'queryUser').then(res => {
         if (res.code === this.$config.SUCCESS_CODE) {
-          if(res.data){
+          if (res.data) {
             this.formData.prodUserId = parseInt(res.data)
           }
 
@@ -274,7 +220,7 @@ export default {
      */
     queryBarCode() {
       if (!this.formData.stationName) {
-        this.appToastFail(this.$t('selectWords', {'search-name': this.$t('stationName')}))
+        this.appToastFail(this.$t('selectWords', { 'search-name': this.$t('stationName') }))
         return
       }
       let params = {
@@ -326,7 +272,7 @@ export default {
         if (res.code === this.$config.SUCCESS_CODE) {
           this.opnKind = res.data.opnKind
           if (res.data.userKind == null) { // 验证 此工序无此用户
-            this.$appDialog.alert({message: this.$t('W_117'),}).then(() => {
+            this.$appDialog.alert({ message: this.$t('W_117'), }).then(() => {
               // 弹出alert后的逻辑处理
               if (this.handleExcuteAlert) {
                 // window.history.go(-1);
@@ -378,12 +324,12 @@ export default {
           this.formData.defectId = res.data.defectId //缺陷id
           this.getBlameNode(res.data.defectId)
 
-        }else {
+        } else {
           //焦点缺陷号
           this.formData.defectNo = ''
           this.formData.defectNoName = ''
           this.formData.defectFines = []
-          this.formData.defectId =null
+          this.formData.defectId = null
           this.setFocus('defectNo')
         }
       })
@@ -471,12 +417,12 @@ export default {
      */
     onRouterRecordProcess() {
       if (!this.formData.uniqueCode) {
-        this.appToastFail(this.$t('inputWords', {'search-name': this.$t('appProductCode')}))
+        this.appToastFail(this.$t('inputWords', { 'search-name': this.$t('appProductCode') }))
         return false;
       }
 
       if (!this.formData.defectNo) { //缺陷编码
-        this.appToastFail(this.$t('inputWords', {'search-name': this.$t('appDefectCode')}))
+        this.appToastFail(this.$t('inputWords', { 'search-name': this.$t('appDefectCode') }))
         return false;
       }
       // if (!this.formData.defectId) { //验证缺陷编码
@@ -487,11 +433,11 @@ export default {
       // }
 
 
-      localStorage.setItem("app-defectId",JSON.stringify({
+      localStorage.setItem("app-defectId", JSON.stringify({
         defectId: this.formData.defectId,
         defectNo: this.formData.defectNo,
         defectNoName: this.formData.defectNoName,
-      }) )
+      }))
       this.formData.placeCode = ''
       this.formData.placeId = null
 
@@ -556,7 +502,7 @@ export default {
             blameUserId: res.userId, //责任工号id
             blameUserId_Name: res.userName, //责任工号
             blameUserName: res.userName,  //责任工号
-            blameWsJobId: res.jobId ,//工种id
+            blameWsJobId: res.jobId,//工种id
             jobName: res.jobName ? res.jobName : null, //工种名称
             deductNum: Number(res.deductNum),  //扣罚数
             defectCode: res.defectNo,  //缺陷扣罚编码
@@ -588,12 +534,16 @@ export default {
         this.appToastFail((this.$t('appProductionJobNumbeWrong')));
         return false;
       }
+      if (!this.gradeFlag) {
+        this.appToastFail(this.$t('W_131'))
+        return false
+      }
       if (!this.formData.uniqueCode) {  //产品条码
-        this.appToastFail(this.$t('inputWords', {'search-name': this.$t('appProductCode')}))
+        this.appToastFail(this.$t('inputWords', { 'search-name': this.$t('appProductCode') }))
         return false;
       }
       if (!this.formData.gradeKindId) {  //产品等级
-        this.appToastFail(this.$t('selectWords', {'search-name': this.$t('appProductGrade')}))
+        this.appToastFail(this.$t('selectWords', { 'search-name': this.$t('appProductGrade') }))
         return false;
       }
       if (this.formData.defectNo) { //缺陷编码
@@ -640,7 +590,7 @@ export default {
             this.formData.uniqueCode = ''
             this.tableRowData = []
             this.productionDefectList = []
-            this.defectFlag =false
+            this.defectFlag = false
             this.getProcessNode()
             this.appToastSuccess(this.$t('I_002'))
           }
@@ -687,6 +637,9 @@ export default {
     //this.setAppTableHeight(0)
   },
   activated() {
+    //改判权限
+    this.gradeFlag = this.$libaray.checkButtonHasRight('half-check-recharge')
+
     //读缓存
     if (localStorage.getItem("app-record-process-data") !== null) {
       let data = JSON.parse(localStorage.getItem("app-record-process-data")) || []
@@ -724,5 +677,4 @@ app-form {
 app-form-main {
   padding: 10px;
 }
-
 </style>

src/view-app/app/prod-management/view-carrier/index.vue

@@ -62,6 +62,7 @@ export default {
      */
     setSearchParams() {
       let params = {}
+      params.pdaFlag = 1
       params.ftyId = this.$store.state.user.ftyId
       params.carrierCode = this.formData.carrierCode
       return params

src/view/pdm/work-record/index.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+name: "work-record"
+}
+</script>
+
+<style scoped>
+
+</style>