Merge branch 'master' of http://123.56.95.229:10010/r/高精

src/api/ManufacturingCenter/ScrappedSupplementaryInvestment.js

@@ -42,7 +42,7 @@ export function searchtable(check1, value1, check3, value3, check5, value5, valu
     }
   })
 }
-export function editSpare(CutCode, number, id) {
+export function editSpare(CutCode, number, id, Unqualified, remarkGroup, people) {
   return request({
     url: '',
     method: 'post',
@@ -51,7 +51,7 @@ export function editSpare(CutCode, number, id) {
       ModularID: router.currentRoute.path,
       type: '2',
       name: '报废补投_提交报废_循环执行',
-      param: '工艺计划流水号组=' + CutCode + '&报废数量组=' + number + '&报废人=' + id
+      param: '工艺计划流水号组=' + CutCode + '&报废数量组=' + number + '&报废人=' + id + '&不合格原因组=' + Unqualified + '&备注组=' + remarkGroup + '&质检人组=' + people
     }
   })
 }

src/views/Assembly/QualityInspectionInformationInquiry/index.vue

@@ -838,7 +838,6 @@ export default {
     },
     QualityType() {
       QualityType().then(response => {
-        console.log(response.data)
         for (let i = 0; i < response.data.length; i++) {
           this.QualityTypeNumber.push({
             label: response.data[i].质检类型,

src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue

@@ -84,16 +84,36 @@
                 {{ scope.row.报废时间 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="报废原因" width="140px" show-overflow-tooltip>
+            <el-table-column align="center" label="报废原因" width="100px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.报废原因 }}
               </template>
             </el-table-column>
+            <el-table-column align="center" label="报废备注" width="140px" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.备注 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="质检员" width="85px">
+              <template slot-scope="scope">
+                {{ scope.row.质检人 }}
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="报废工时(分)" width="105px">
               <template slot-scope="scope">
                 {{ scope.row.报废工时 }}
               </template>
             </el-table-column>
+            <el-table-column align="center" label="补投时间" width="85px">
+              <template slot-scope="scope">
+                {{ scope.row.补投时间 ? scope.row.补投时间.split(' ')[0] : '' }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="补投人" width="85px">
+              <template slot-scope="scope">
+                {{ scope.row.补投人 }}
+              </template>
+            </el-table-column>
           </el-table>
           <div class="block" style="margin-top: 10px">
             <el-pagination

src/views/ManufacturingCenter/InitialProduction/index.vue

@@ -227,7 +227,7 @@
           </el-table-column>
           <el-table-column
             label="投产时间">
-            <template slot-scope="scope">{{ scope.row.操作时间 }}</template>
+            <template slot-scope="scope">{{ scope.row.操作时间 ? scope.row.操作时间.split(' ')[0] : '' }}</template>
           </el-table-column>
           <!--<el-table-column-->
           <!--label="是否外协">-->
@@ -239,18 +239,18 @@
           <!--</el-table-column>-->
           <el-table-column
             label="机加工开始时间">
-            <template slot-scope="scope">{{ scope.row.机加工开始时间 }}</template>
+            <template slot-scope="scope">{{ scope.row.机加工开始时间 ? scope.row.机加工开始时间.split(' ')[0] : '' }}</template>
           </el-table-column>
           <el-table-column
             label="机加工结束时间">
-            <template slot-scope="scope">{{ scope.row.机加工结束时间 }}</template>
+            <template slot-scope="scope">{{ scope.row.机加工结束时间 ? scope.row.机加工结束时间.split(' ')[0] : '' }}</template>
           </el-table-column>
           <el-table-column label="操作" width="200px">
             <template slot-scope="scope">
               <el-button
                 size="mini"
                 fixed="rihgt"
-                type="primary"
+                type="text"
                 icon="el-icon-edit"
                 @click="handleEdit1(tableData1, scope.$index, scope.row, 'form')">编辑</el-button>
             </template>

src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue

@@ -359,7 +359,7 @@ export default {
         if (val[i].进程 !== '编制中') {
           this.jinyong = true
         }
-        if (val[i].进程 === '编制中') {
+        if (val[i].进程 === '编制中' || val[i].进程 === '未分配') {
           this.jinyong1 = true
         }
       }

src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue

@@ -194,6 +194,9 @@ export default {
       procedureGroup: [],
       ScrapQuantity: [],
       ProcessPlanNumber: [],
+      Unqualified: [],
+      remarkGroup: [],
+      people: [],
       Data: [],
       tableData: [], // 表格数据
       total: 0, // 总条数
@@ -287,12 +290,18 @@ export default {
       }).then(() => {
         this.ScrapQuantity = []
         this.ProcessPlanNumber = []
+        this.Unqualified = []
+        this.remarkGroup = []
+        this.people = []
         for (let i = 0; i < this.procedureGroup.length; i++) {
           this.ScrapQuantity.push(this.procedureGroup[i].不合格数量)
           this.ProcessPlanNumber.push(this.procedureGroup[i].工艺计划流水号)
+          this.Unqualified.push(this.procedureGroup[i].不合格原因文本)
+          this.remarkGroup.push(this.procedureGroup[i].备注)
+          this.people.push(this.procedureGroup[i].人员编号)
         }
         this.handleEdit_disable = true
-        editSpare(this.ProcessPlanNumber, this.ScrapQuantity, this.id).then(response => {
+        editSpare(this.ProcessPlanNumber, this.ScrapQuantity, this.id, this.Unqualified, this.remarkGroup, this.people).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('报废成功')
             this.searchTable()