2023-09-19 设备和质量修改2

2 years ago · 1902b7fe8d
4 changed files with 118 additions and 3 deletions
--- a/src/views/modules/eam/eamWorkOrderForDefect.vue
+++ b/src/views/modules/eam/eamWorkOrderForDefect.vue
@ -186,6 +186,17 @@
          <el-button type="primary" @click="checkSparPartImageModal()">备件图片</el-button>
        </el-form-item>
      </el-form>
+      <el-form :inline="true" label-position="top">
+        <el-form-item :label="'计划执行日期'">
+          <el-date-picker style="width: 159px" v-model="detailData.planDate" type="datetime" readonly value-format='yyyy-MM-dd' format='yyyy-MM-dd'></el-date-picker>
+        </el-form-item>
+        <el-form-item :label="'到达时间'">
+          <el-date-picker style="width: 159px" v-model="detailData.reachDate" type="datetime" readonly value-format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss'></el-date-picker>
+        </el-form-item>
+        <el-form-item :label="'实际执行时间'">
+          <el-date-picker style="width: 159px" v-model="detailData.actualDate" type="datetime" readonly value-format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss'></el-date-picker>
+        </el-form-item>
+      </el-form>
      <el-form :inline="true" label-position="top">
        <el-form-item label="机修人员:">
          <el-input v-model="detailData.actualOperatorName" readonly style="width: 505px"></el-input>
@ -1034,7 +1045,9 @@
          defectID: row.defectID,
          defectDesc: row.defectDesc,
          actualOperatorName: row.actualOperatorName,
-          disposalMeasures: row.disposalMeasures
+          planDate: row.planDate,
+          reachDate: row.reachDate,
+          actualDate: row.actualDate,
        }
        this.detailModelFlag = true;
      },
--- a/src/views/modules/qc/FAIResultEntry.vue
+++ b/src/views/modules/qc/FAIResultEntry.vue
@ -189,6 +189,12 @@
        <el-form-item :label="'物料编码'">
          <el-input v-model="detailData.partNo" disabled style="width: 100px"></el-input>
        </el-form-item>
+        <el-form-item :label="'PN'">
+          <el-input v-model="detailData.cinvSourceCode" disabled style="width: 100px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'SKU'">
+          <el-input v-model="detailData.sku" disabled style="width: 100px"></el-input>
+        </el-form-item>
        <el-form-item :label="'物料名称'">
          <el-input v-model="detailData.partDesc" disabled style="width: 200px"></el-input>
        </el-form-item>
@ -390,7 +396,7 @@
          width="100"
          label="操作">
          <template slot-scope="scope">
-            <a  @click="downloadFile(scope.row)" >下载</a>
+            <a  @click="downloadFile(scope.row)">下载</a>
            <a type="text" size="small"  @click="deleteFile(scope.row)">删除</a>
          </template>
        </el-table-column>
@ -601,6 +607,30 @@
            status: true,
            fixed: '',
          },
+          {
+            columnProp: 'cinvSourceCode',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: 'PN',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            columnProp: 'sku',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: 'SKU',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
          {
            columnProp: 'partDesc',
            headerAlign: "center",
@ -702,6 +732,8 @@
          inspectorNo: '',
          inspectionRemark: '',
          submitFlag: '',
+          cinvSourceCode: '',
+          sku: ''
        },
        detailInformationFlag:false,
        detailList:[],
@ -1368,6 +1400,8 @@
        this.detailData.inspectionResult = row.inspectionResult
        this.detailData.inspectorNo = row.inspectorNo
        this.detailData.inspectionRemark = row.inspectionRemark
+        this.detailData.cinvSourceCode = row.cinvSourceCode
+        this.detailData.sku = row.sku
        faiDetailSearch(this.detailData).then(({data}) => {
          this.detailList = data.rows
        })
--- a/src/views/modules/qc/FQCResultEntry.vue
+++ b/src/views/modules/qc/FQCResultEntry.vue
@ -187,6 +187,12 @@
        <el-form-item :label="'物料编码'">
          <el-input v-model="detailData.partNo" disabled style="width: 100px"></el-input>
        </el-form-item>
+        <el-form-item :label="'PN'">
+          <el-input v-model="detailData.cinvSourceCode" disabled style="width: 100px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'SKU'">
+          <el-input v-model="detailData.sku" disabled style="width: 100px"></el-input>
+        </el-form-item>
        <el-form-item :label="'物料名称'">
          <el-input v-model="detailData.partDesc" disabled style="width: 200px"></el-input>
        </el-form-item>
@ -597,6 +603,30 @@
            status: true,
            fixed: '',
          },
+          {
+            columnProp: 'cinvSourceCode',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: 'PN',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            columnProp: 'sku',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: 'SKU',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
          {
            columnProp: 'partDesc',
            headerAlign: "center",
@ -698,6 +728,8 @@
          inspectorNo: '',
          inspectionRemark: '',
          submitFlag: '',
+          cinvSourceCode: '',
+          sku: ''
        },
        detailInformationFlag:false,
        detailList:[],
@ -1354,6 +1386,8 @@
        this.detailData.inspectionResult = row.inspectionResult
        this.detailData.inspectorNo = row.inspectorNo
        this.detailData.inspectionRemark = row.inspectionRemark
+        this.detailData.cinvSourceCode = row.cinvSourceCode
+        this.detailData.sku = row.sku
        fqcDetailSearch(this.detailData).then(({data}) => {
          this.detailList = data.rows
        })
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@ -209,6 +209,12 @@
        <el-form-item :label="'物料编码'">
          <el-input v-model="detailData.partNo" disabled style="width: 100px"></el-input>
        </el-form-item>
+        <el-form-item :label="'PN'">
+          <el-input v-model="detailData.cinvSourceCode" disabled style="width: 100px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'SKU'">
+          <el-input v-model="detailData.sku" disabled style="width: 100px"></el-input>
+        </el-form-item>
        <el-form-item :label="'物料名称'">
          <el-input v-model="detailData.partDesc" disabled style="width: 200px"></el-input>
        </el-form-item>
@ -692,6 +698,30 @@
            status: true,
            fixed: '',
          },
+          {
+            columnProp: 'cinvSourceCode',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: 'PN',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            columnProp: 'sku',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: 'SKU',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
          {
            columnProp: 'partDesc',
            headerAlign: "center",
@ -793,6 +823,8 @@
          inspectorNo: '',
          inspectionRemark: '',
          submitFlag: '',
+          cinvSourceCode: '',
+          sku: ''
        },
        detailInformationFlag:false,
        detailList:[],
@ -1146,7 +1178,7 @@
      },

      // 删除文件
-      deleteFile(row){
+      deleteFile (row) {
        let tempData = {
          site: row.orderRef1,
          inspectionNo: row.orderRef2
@ -1552,6 +1584,8 @@
        this.detailData.inspectionResult = row.inspectionResult
        this.detailData.inspectorNo = row.inspectorNo
        this.detailData.inspectionRemark = row.inspectionRemark
+        this.detailData.cinvSourceCode = row.cinvSourceCode
+        this.detailData.sku = row.sku
        ipqcDetailSearch(this.detailData).then(({data}) => {
          this.detailList = data.rows
        })