外协及电子档案模块修改

3 weeks ago · 5906808c1e
parent f67a9d6573
commit 5906808c1e
8 changed files with 57 additions and 32 deletions
--- a/src/views/oem/oemApproval/index.vue
+++ b/src/views/oem/oemApproval/index.vue
@ -314,10 +314,10 @@ export default {
          this.$message.error("请选择状态为【待审核】的数据");
          return
        }
-        this.woId = this.selectionList.map(item => item.id).join(',')
+        this.woId = this.selectionList.map(item => item.woId).join(',')
        this.isOpen = true;
      }else{
-        this.woId = row.id
+        this.woId = row.woId
        this.isOpen = true;
      }
    },
--- a/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue
+++ b/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue
@ -620,7 +620,8 @@ export default {
                ...this.query,
                postPlatingStorageTimeStart:this.query && this.query.putStoreTime && this.query.putStoreTime.length != 0 && this.query.putStoreTime[0],
                postPlatingStorageTimeEnd:this.query && this.query.putStoreTime && this.query.putStoreTime.length != 0 && this.query.putStoreTime[1],
-                memo:this.query && this.query.memo && this.query.memo.length != 0 && this.query.memo.join(';'),
+                memo:this.query && this.query.memo && typeof(this.query.memo) == 'object' && this.query.memo.length != 0 ? this.query.memo.join(';') : this.query.memo,
+                // memo:this.query && this.query.memo && this.query.memo.length != 0 && this.query.memo.join(';'),
            }
            if(params.putStoreTime) delete params.putStoreTime;
            getStatement(params).then(res =>{
--- a/src/views/oem/oemOrderSettlement/components/settlementCompleted.vue
+++ b/src/views/oem/oemOrderSettlement/components/settlementCompleted.vue
@ -636,7 +636,7 @@ export default {
                ...this.query,
                postPlatingStorageTimeStart:this.query && this.query.putStoreTime && this.query.putStoreTime.length != 0 && this.query.putStoreTime[0],
                postPlatingStorageTimeEnd:this.query && this.query.putStoreTime && this.query.putStoreTime.length != 0 && this.query.putStoreTime[1],
-                memo:this.query && this.query.memo && this.query.memo.length != 0 && this.query.memo.join(';'),
+                memo:this.query && this.query.memo && typeof(this.query.memo) == 'object' && this.query.memo.length != 0 ? this.query.memo.join(';') : this.query.memo,
            }
            if(params.putStoreTime) delete params.putStoreTime;
            getStatement(params).then(res =>{
--- a/src/views/oem/oemOrderSettlement/components/unsettled.vue
+++ b/src/views/oem/oemOrderSettlement/components/unsettled.vue
@ -50,7 +50,7 @@
        </el-dialog>

        <!-- 补充结算弹窗 -->
-        <el-dialog title="预结算" append-to-body :modelValue="openSupplement" width="30%">
+        <el-dialog title="预结算" append-to-body :modelValue="openSupplement" width="30%" @close="openSupplement = false">
            <el-form :model="supplementForm" :rules="supplementRules" ref="supplementForm" label-width="100px">
                <el-form-item label="镀后入库时间" prop="putStoreTime">
                    <el-date-picker
@ -123,7 +123,7 @@ export default {
                border: true,
                index: false,
                selection: true,
-                rowKey: 'wpId',
+                // rowKey: 'wpId',
                editBtn: false,
                viewBtn: false,
                delBtn: false,
--- a/src/views/productionDisposition/hearingDialog.vue
+++ b/src/views/productionDisposition/hearingDialog.vue
@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="新增" append-to-body :modelValue="openShow" width="70%" @close="closeDialog" fullscreen>
+    <el-dialog title="新增" append-to-body :modelValue="openShow" width="70%" @close="closeDialog()" fullscreen>
        <div class="test_type">
            <span>审理类型：</span>
            <el-radio-group v-model="testType" @change="changeType" :disabled="type == 'view'">
@ -7,14 +7,11 @@
                <el-radio :value="2">内部审理</el-radio>
            </el-radio-group>
        </div>
-        <div class="test_type" v-if="testType == 1">
+        <!-- <div class="test_type" v-if="testType == 1">
            <span>流程卡号：</span>
-            <!-- <el-select v-model="detailInfo.refWoId" placeholder="请选择" style="width: 400px;" :disabled="type == 'view'">
-                <el-option v-for="item in historyList" :key="item.woId"  :label="item.woInfo" :value="item.woId" />
-            </el-select> -->
            <el-input placeholder="请输入流程卡号" style="width:400px;" v-model="cardNo"></el-input>
            <el-button @click="handleUse" type="primary" style="margin-left:10px;" :disabled="type == 'view'">应用</el-button>
-        </div>
+        </div> -->
        <el-descriptions  title="订单信息" border :column="4" label-width="110">
            <el-descriptions-item label="车间订单号:">{{detailInfo.woCode}}</el-descriptions-item>
            <el-descriptions-item label="发现工序:">{{detailInfo.productionDisposition}}</el-descriptions-item>
@ -34,18 +31,15 @@
        </el-descriptions>
        <el-descriptions v-if="testType == 1" class="margin-top" title="质量信息" border :column="3" label-width="110" style="margin-bottom: 24px;">

-            <!-- <el-descriptions-item label="历史订单:">
+            <el-descriptions-item label="历史订单:">
                <el-select v-model="value" placeholder="请选择" style="width: 400px;" :disabled="type == 'view'">
                    <el-option label="订单1" value="1" />
                    <el-option label="订单2" value="2" />
                </el-select>
-            </el-descriptions-item> -->
+            </el-descriptions-item>
            <el-descriptions-item label="处置单类型:">
-                <el-select v-model="detailInfo.reviewOrderMode" placeholder="请选择" style="width: 400px;" :disabled="type == 'view'" @change="changeOrderMode" filterable
-    clearable >
+                <el-select v-model="detailInfo.reviewOrderMode" placeholder="请选择" style="width: 400px;" :disabled="type == 'view'" @change="changeOrderMode" filterable clearable >
                    <el-option v-for="item in disposeTypeList" :key="item.id" :label="item.dictValue" :value="item.dictKey" />
-                    <!-- <el-option label="装配模式" value="2" /> -->
-                    <!-- <el-option label="售后模式" value="3" /> -->
                </el-select>
            </el-descriptions-item>

@ -295,7 +289,7 @@

        <template #footer>
            <span class="dialog-footer">
-                <el-button plain @click="closeDialog">取消</el-button>
+                <el-button plain @click="closeDialog()">取消</el-button>
                <el-button type="primary" v-if="testType == 1 && type != 'view'" @click="submit(-1)">保存</el-button>
                <el-button type="primary" v-if="testType == 2 && type != 'view'" @click="submitInside">提交</el-button>
                <el-button type="primary" v-if="testType == 1 && type != 'view'" plain @click="submit(1)">提交质保</el-button>
@ -492,8 +486,8 @@ export default {
                    this.detailInfo.refWoId = res.data.data.refWoId == 0 ? '' : res.data.data.refWoId
                    this.testType = res.data.data.bizType == 3 ? 1 : 2
                    this.disposalType = res.data.data.bizType == 3 ? '' : res.data.data.bizType
-                    this.detailInfo.scrapNum = this.disposalType == 1 ? '' : res.data.data.scrapNum
-                    this.detailInfo.reDoNum = this.disposalType == 2 ? '' : res.data.data.reDoNum
+                    this.detailInfo.scrapNum = this.disposalType == 1 ? 0 : res.data.data.scrapNum
+                    this.detailInfo.reDoNum = this.disposalType == 2 ? 0 : res.data.data.reDoNum
                    this.checkList = []
                    this.checkList.push(
                        res.data.data.isBatProblem == 1 ? 'isBatProblem' : null,
--- a/src/views/productionDisposition/index.vue
+++ b/src/views/productionDisposition/index.vue
@ -7,7 +7,7 @@
            @sort-change="sortChange"
            >
            <template #menu-left>
-                 
+                <el-input placeholder="扫描流程卡号" v-model="cardNo" @keyup.enter.native="queryCard"></el-input>
            <!--<el-button type="primary"  @click="addReview(1,null)">零件模式</el-button>
            <el-button type="primary"  @click="addReview(2,null)">装配模式</el-button> -->
            </template>
@ -110,6 +110,7 @@ export default {
                currentPage: 1,
                total: 0,
            },
+            cardNo:"",
            trialType: null,
            showDialog: false,
            rsId: null,
@ -590,6 +591,28 @@ export default {

    },
    methods: {
+        queryCard(){
+            getProductionDispositionList({
+                cardNo:this.cardNo,
+                current:this.page.currentPage,
+                size:this.page.pageSize
+            }).then(res =>{
+                console.log('res------------',res)
+                if(res.data.data.records.length == 1){
+                    if(res.data.data.records[0].status == 0 || res.data.data.records[0].status == -1){
+                        this.rsId = res.data.data.records[0].id
+                        this.dialogType = 'submit'
+                        this.hearingOpen = true
+                    }else{
+                        this.data = res.data.data.records
+                        this.cardNo = ''
+                    }
+                }else{
+                    this.data = res.data.data.records
+                    this.cardNo = ''
+                }
+            })
+        },
        // 字段排序
        sortChange({ prop, order }) {
            console.log('perop---------', prop);
--- a/src/views/qualityManagement/inspectionArchiving/ERecord/index.vue
+++ b/src/views/qualityManagement/inspectionArchiving/ERecord/index.vue
@ -23,8 +23,8 @@
      <template #menu="{ row }">
        <span>
          <el-button type="text"  @click="inspectionRecord(row)" v-if="permission.ERecord_test">检验记录</el-button>
-          <el-button v-if="row.yieldType == 1 && permission.ERecord_hotlist" type="text"  @click="rbPrint(row,2)" >热表打印</el-button>
-          <el-button v-if="row.yieldType != 1 && permission.ERecord_sintering" type="text"  @click="sjPrint(row)">烧结打印</el-button>
+          <el-button v-if="row.yieldType == 12001 && permission.ERecord_hotlist" type="text"  @click="rbPrint(row,2)" >热表打印</el-button>
+          <el-button v-if="row.yieldType != 12001 && permission.ERecord_sintering" type="text"  @click="sjPrint(row)">烧结打印</el-button>
        </span>
        <el-button type="text"  @click="handleThickness(row)" v-if="permission.ERecord_thickness">测厚打印</el-button>
      </template>
@ -287,6 +287,12 @@ export default {
          //     },
          //   ],
          // },
+          {
+            label:"流程卡号",
+            prop:"cardNo",
+            width:120,
+            sortable:true
+          },
          {
            label: '批次号',
            prop: 'batchNo',
@ -754,7 +760,7 @@ export default {
        
      },
      planOpenSj:false,
-      sjTypeSelectOpen: true,
+      sjTypeSelectOpen: false,
      sjPrintType: 1,
      showSjPrint:false,
      data: [],
@ -886,6 +892,7 @@ export default {
      this.planOpenSj = false
      this.prWorkPlanList = []
      this.checkedList = []
+      this.checkWoId = row.woId
      // this.checkWoId = '2019646268865155074'
      this.woId = row.woId
      getProcessList({
--- a/src/views/qualityManagement/inspectionArchiving/ERecord/printDialog.vue
+++ b/src/views/qualityManagement/inspectionArchiving/ERecord/printDialog.vue
@ -555,13 +555,13 @@ export default {
        }
    },
    created(){
-      const { modelOne, modelTwo, modelThree, modelFour, modelFive } =
-        printOrderJson.data;
-      this.modelOne = modelOne
-      this.modelTwo = modelTwo
-      this.modelThree = modelThree
-      this.modelFour = modelFour;
-      this.modelFive = modelFive;
+      // const { modelOne, modelTwo, modelThree, modelFour, modelFive } =
+      //   printOrderJson.data;
+      // this.modelOne = modelOne
+      // this.modelTwo = modelTwo
+      // this.modelThree = modelThree
+      // this.modelFour = modelFour;
+      // this.modelFive = modelFive;
      
      getWordDetail({
        woId:this.woId,