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

src/api/Inventory/Inboundscanning.js

@@ -81,3 +81,17 @@ export function insertOne(num0, num1, people, num4, num5, num6, num7) {
     }
   })
 }
+// 更新零件状态
+export function FinishPart(num0) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '2',
+      name: 'MES_机加工MES_库存管理_入库模块_更新零件状态',
+      param: '工艺计划流水号组=' + num0
+    }
+  })
+}

src/api/ManufacturingCenter/AddingOrder.js

@@ -80,8 +80,7 @@ export function getTable(checkbox_Machine, Machine, checkbox_Group, Group, check
       ModularID: router.currentRoute.path,
       type: '1',
       name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_横向赋值新建存储过程_新',
-      param: '项目流水号_check=0=string&机床流水号_check=' + checkbox_Machine + '=string&机床流水号=' + Machine + '=string&组件流水号_check=' + checkbox_Group + '=string&组件流水号=' + Group + '=string&零件图号_check=' + checkbox_number + '=string&零件图号=' + number + '=string&是否查询全部数据=1=string&单件是否外协=1=string&考核状态=6=int&开始时间_check=0&开始时间=' + k + '&结束时间_check=0&结束时间=' + m,
+      param: '项目流水号_check=0=string&机床流水号_check=' + checkbox_Machine + '=string&机床流水号=' + Machine + '=string&组件流水号_check=' + checkbox_Group + '=string&组件流水号=' + Group + '=string&零件图号_check=' + checkbox_number + '=string&零件图号=' + number + '=string&是否查询全部数据=1=string&单件是否外协=1=string&考核状态=6=int&开始时间_check=0&开始时间=' + k + '&结束时间_check=0&结束时间=' + m + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
-      Pagination: pageCurrent + '&' + pageSize
     }
   })
 }

src/api/Outsourcing/OutsourcingPartsQuery.js

@@ -26,8 +26,7 @@ export function searchTable(check, supplierNameValue, check1, MaterialsValue, ch
       ModularID: router.currentRoute.path,
       type: '1',
       name: '车间生产管理_外协零件_查询数据_新',
-      param: '外协厂家_check=' + check + '&外协厂家=' + supplierNameValue + '&外协状态_check=' + check1 + '&外协状态=' + MaterialsValue + '&时间_check=' + check2 + '&开始时间=' + time1 + '&结束时间=' + time2,
+      param: '外协厂家_check=' + check + '&外协厂家=' + supplierNameValue + '&外协状态_check=' + check1 + '&外协状态=' + MaterialsValue + '&时间_check=' + check2 + '&开始时间=' + time1 + '&结束时间=' + time2 + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
-      Pagination: pageCurrent + '&' + pageSize
     }
   })
 }

src/views/Assembly/AssemblyProcessPlanning/index.vue

@@ -685,9 +685,7 @@ export default {
       this.form2.序号 = row.序号
       this.form2.装配任务 = row.装配任务
       this.Group = ''
-      console.log(row, 1111)
       this.form2.组件 = (row.组件流水号.split(',')).map(Number)
-      console.log(this.form2.组件)
     },
     submitAdd() {
       this.GroupNumberValue1 = this.form2.组件[0]

src/views/BasicData/PartsNumberMaintenance/index.vue

@@ -28,30 +28,12 @@
           <el-button style="float: right;margin-bottom: 3px" type="danger" size="small" plain @click="alldelete()">全部删除</el-button>
         </el-tooltip>
       </div>
-      <el-table
+      <el-table v-loading="loading" :data="tableData" highlight-current-row border stripe size="mini" style="width: 100%;max-height: 520px" height="320">
-        v-loading="loading"
+        <el-table-column label="序号" align="center" type="index" width="50"/>
-        :data="tableData"
+        <el-table-column label="机床图号" align="center" min-width="150px">
-        highlight-current-row
-        border
-        stripe
-        size="mini"
-        style="width: 100%;max-height: 520px"
-        height="320">
-        <el-table-column
-          label="序号"
-          align="center"
-          type="index"
-          width="50"/>
-        <el-table-column
-          label="机床图号"
-          align="center"
-          min-width="150px">
           <template slot-scope="scope">{{ scope.row.机床图号 }}</template>
         </el-table-column>
-        <el-table-column
+        <el-table-column label="零件图号" align="center" min-width="200px">
-          label="零件图号"
-          align="center"
-          min-width="200px">
           <template slot-scope="scope">{{ scope.row.零件图号 }}</template>
         </el-table-column>
         <el-table-column
@@ -113,9 +95,9 @@
         </el-table-column>
         <el-table-column label="操作" fixed="right" align="center" width="200">
           <template slot-scope="scope">
-
             <el-tooltip :open-delay="1000" effect="dark" content="编辑零件数量" placement="top">
               <el-button
+                :disabled="scope.row.考核状态>=6"
                 size="mini"
                 type="primary"
                 plain
@@ -853,7 +835,6 @@ export default {
         this.loading = false
         const res = response.data
         this.total = res.total
-        // console.log(this.tableData)
         this.tableData = res.map(item => {
           if (item.整改类型 === '1') {
             item.整改类型 = '新增'
@@ -871,7 +852,6 @@ export default {
         const data = response.data
         this.totalWB = data.total
         this.tableDataWB = data.map(item => {
-          console.log(item)
           item.零件类型 = item.零件类型 === '2' ? '外购件' : '标准件'
           return item
         })

src/views/Inventory/Inboundscanning/index.vue

@@ -70,11 +70,36 @@
         </el-table-column>
       </el-table>
     </el-card>
+
+    <el-dialog :visible.sync="dialogFormVisible" title="更新零件状态" center>
+      <el-table :data="finishParts" stripe border size="mini" style="width: 100%;margin: 3px 0px" height="300px">
+        <el-table-column label="序号" align="center" type="index" width="55"/>
+        <el-table-column label="项目名称" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.项目名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="机床图号" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.机床图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="零件图号" align="center" min-width="150">
+          <template slot-scope="scope">
+            {{ scope.row.零件图号 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogFormVisible = false">取消</el-button>
+        <el-button type="primary" size="small" @click="FinishPart()">确定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { searchTable, insertOne, getlocate, searchPartNumber, CraftNumber } from '@/api/Inventory/Inboundscanning'
+import { searchTable, insertOne, getlocate, searchPartNumber, CraftNumber, FinishPart } from '@/api/Inventory/Inboundscanning'
 import { mapGetters } from 'vuex'
 import { wsuri, name } from '@/utils/request'
 export default {
@@ -94,7 +119,9 @@ export default {
       locateName: [], // 货位名称下拉框
       locateNumber: '',
       Partpaint: '',
-      tableDataNum: []
+      tableDataNum: [],
+      dialogFormVisible: false,
+      finishParts: []
     }
   },
   computed: {
@@ -178,32 +205,38 @@ export default {
           type: 'warning'
         })
       } else {
+        this.finishParts = []
         this.listLoading = true
         searchTable(this.partNumber).then(response => {
+          console.log(response.data)
           if (response.data.length === 0) {
             this.listLoading = false
             this.$notify({
               title: '警告',
-              message: '该零件未加工完成',
+              message: '该零件未加工',
               type: 'warning'
             })
           } else {
             for (let i = 0; i < response.data.length; i++) {
-              if (response.data[i].考核状态 === 8) {
+              if (response.data[i].状态 === '未完成') {
-                this.listLoading = false
                 this.$notify({
                   title: '警告',
-                  message: 'P' + response.data[i].工艺计划流水号 + '已入库',
+                  message: 'P' + response.data[i].工艺计划流水号 + '未加工完成',
                   type: 'warning'
                 })
-              } else if (response.data[i].考核状态 === 9) {
+              } else if (response.data[i].状态 === '可完成') {
-                this.listLoading = false
+                this.finishParts.push({
-                this.$notify({
+                  plannumber: response.data[i].剩余数量,
-                  title: '警告',
+                  innumber: response.data[i].入库数量,
-                  message: 'P' + response.data[i].工艺计划流水号 + '已出库',
+                  capture: '',
-                  type: 'warning'
+                  note: '',
+                  工艺计划流水号: response.data[i].工艺计划流水号,
+                  项目名称: response.data[i].项目名称,
+                  机床图号: response.data[i].机床图号,
+                  零件图号: response.data[i].零件图号
                 })
-              } else if (response.data[i].考核状态 === 7) {
+              } else if (response.data[i].状态 === '已完成') {
+                if (response.data[i].考核状态 === '7') {
                   this.listLoading = false
                   this.tableData.push({
                     plannumber: response.data[i].剩余数量,
@@ -229,14 +262,65 @@ export default {
                     })
                     return preVal
                   }, [])
+                } else if (response.data[i].考核状态 === '8') {
+                  this.$notify({
+                    title: '警告',
+                    message: 'P' + response.data[i].工艺计划流水号 + '已入库',
+                    type: 'warning'
+                  })
+                } else if (response.data[i].考核状态 === '9') {
+                  this.$notify({
+                    title: '警告',
+                    message: 'P' + response.data[i].工艺计划流水号 + '已出库',
+                    type: 'warning'
+                  })
+                }
               }
             }
           }
         }).then(() => {
+          if (this.finishParts.length > 0) {
+            this.dialogFormVisible = true
+          }
           this.listLoading = false
         })
       }
     },
+    FinishPart() {
+      var nums = []
+      this.finishParts.map(v => {
+        nums.push(v.工艺计划流水号)
+      })
+      FinishPart(nums).then(response => {
+        this.dialogFormVisible = false
+        for (let i = 0; i < this.finishParts.length; i++) {
+          this.tableData.push({
+            plannumber: this.finishParts[i].plannumber,
+            innumber: this.finishParts[i].innumber,
+            capture: '',
+            note: '',
+            工艺计划流水号: this.finishParts[i].工艺计划流水号,
+            项目名称: this.finishParts[i].项目名称,
+            机床图号: this.finishParts[i].机床图号,
+            零件图号: this.finishParts[i].零件图号
+          })
+          const hash = {} // 一个新数组，data为你需要去重的数组，newData用于接收去重后的数组, curVal.去重条件
+          this.tableDataNum = this.tableData.reduce((preVal, curVal) => {
+            hash[curVal.工艺计划流水号] ? '' : hash[curVal.工艺计划流水号] = true && preVal.push({
+              工艺计划流水号: curVal.工艺计划流水号,
+              项目名称: curVal.项目名称,
+              机床图号: curVal.机床图号,
+              零件图号: curVal.零件图号,
+              plannumber: curVal.plannumber,
+              innumber: curVal.innumber,
+              capture: '',
+              note: ''
+            })
+            return preVal
+          }, [])
+        }
+      })
+    },
     // 修改入库
     Innumber() {
       this.$confirm('此操作将不可逆转,且如果入库数量大于计划数量，则全部入库,是否继续?', '提示', {

src/views/Inventory/InventoryCheck/index.vue

@@ -24,7 +24,7 @@
           <el-button type="distribution" icon="el-icon-edit" size="small" @click="addMaterial()">新增</el-button>
         </el-row>
       </div>
-      <el-table :data="tableData1" stripe highlight-current-row border height="550px" style="width: 865px" size="mini">
+      <el-table v-loading="loading" :data="tableData1" stripe highlight-current-row border height="550px" style="width: 865px" size="mini">
         <el-table-column label="名称" prop="物料名称" align="center" width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
@@ -185,6 +185,7 @@ export default {
       locateNameValue: '',
       locateName: [],
       tableData1: [],
+      loading: false,
       pageCurrent: 1,
       pageSize: 20,
       total: 0,
@@ -251,6 +252,7 @@ export default {
     },
     // 根据条件查物料货位数量
     searchMaterial() {
+      this.loading = true
       let check1, check2, check3, check4, check5
       this.materialName ? check1 = 1 : check1 = 0
       this.materialSpec ? check2 = 1 : check2 = 0
@@ -263,18 +265,19 @@ export default {
         data: {
           type: '1',
           name: `库存管理_库存盘点_物料货位数量_查询数据`,
-          param: `物料名称_check=${check1}&物料名称=${this.materialName}&物料规格_check=${check2}&物料规格=${this.materialSpec}&物料型号_check=${check3}&物料型号=${this.materialModel}&仓库流水号_check=${check4}&仓库流水号=${this.inventoryNameValue}&货位流水号_check=${check5}&货位流水号=${this.locateNameValue}`,
+          param: `物料名称_check=${check1}&物料名称=${this.materialName}&物料规格_check=${check2}&物料规格=${this.materialSpec}&物料型号_check=${check3}&物料型号=${this.materialModel}&仓库流水号_check=${check4}&仓库流水号=${this.inventoryNameValue}&货位流水号_check=${check5}&货位流水号=${this.locateNameValue}` + `&PageCurrent=${this.pageCurrent}&PageSize=${this.pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
-          Pagination: this.pageCurrent + '&' + this.pageSize
         }
       }
       request(param).then(res => {
-        this.tableData1 = res.data.rows
+        console.log(res.data)
+        this.tableData1 = res.data.result
         this.tableData1.map(v => {
           this.$set(v, 'changeValue', false)
           v.原货位存量 = v.货位存量
           return v
         })
-        this.total = res.data.total
+        this.loading = false
+        this.total = parseInt(res.data.output[0].ItemCount)
       })
     },
     // 分页
@@ -384,4 +387,3 @@ export default {
     width:165px
   }
 </style>
-

src/views/ManufacturingCenter/AddingOrder/index.vue

@@ -443,24 +443,24 @@ export default {
         this.checkbox_number = 1
       }
       getTable(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, this.startTime, this.endTime, this.pageCurrent, this.pageSize).then(response => {
-        if (response.data.rows.length !== 0) {
+        if (response.data.result.length !== 0) {
-          for (let i = 0; i < response.data.rows.length; i++) {
+          for (let i = 0; i < response.data.result.length; i++) {
             this.tableData.push({
-              工艺计划流水号: response.data.rows[i].工艺计划流水号,
+              工艺计划流水号: response.data.result[i].工艺计划流水号,
-              考核状态: response.data.rows[i].考核状态,
+              考核状态: response.data.result[i].考核状态,
-              序号: response.data.rows[i].序号,
+              序号: response.data.result[i].序号,
-              跟单号: response.data.rows[i].跟单号,
+              跟单号: response.data.result[i].跟单号,
-              零件图号: response.data.rows[i].零件图号,
+              零件图号: response.data.result[i].零件图号,
-              零件名称: response.data.rows[i].零件名称,
+              零件名称: response.data.result[i].零件名称,
-              加工数: response.data.rows[i].完成数量, // MES里采集  现在没有
+              加工数: response.data.result[i].完成数量, // MES里采集  现在没有
-              投产数量: response.data.rows[i].批次数量,
+              投产数量: response.data.result[i].批次数量,
-              完成日期: response.data.rows[i].机加工实际完成时间 ? response.data.rows[i].机加工实际完成时间.split(' ')[0] : '', // 排产时间
+              完成日期: response.data.result[i].机加工实际完成时间 ? response.data.result[i].机加工实际完成时间.split(' ')[0] : '', // 排产时间
-              计划结束时间: response.data.rows[i].机加工结束时间 ? response.data.rows[i].机加工结束时间.split(' ')[0] : '',
+              计划结束时间: response.data.result[i].机加工结束时间 ? response.data.result[i].机加工结束时间.split(' ')[0] : '',
-              客户名称: response.data.rows[i].客户名称 // 客户名
+              客户名称: response.data.result[i].客户名称 // 客户名
             })
           }
         }
-        this.total = response.data.total
+        this.total = parseInt(response.data.output[0].ItemCount)
         this.loading0 = false
       }).catch(() => {
         this.loading0 = false

src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue

@@ -39,10 +39,9 @@
                 {{ scope.row.投产数量 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="工序状态" show-overflow-tooltip min-width="90">
+            <el-table-column align="center" label="完成日期" show-overflow-tooltip min-width="90">
               <template slot-scope="scope">
-                <span v-if="scope.row.工序状态 >= 4">已完成</span>
+                {{ scope.row.完成日期 ? scope.row.完成日期.split(' ')[0] : '' }}
-                <span v-else>未完成</span>
               </template>
             </el-table-column>
           </el-table>

src/views/ManufacturingCenter/InitialProduction/index.vue

@@ -732,11 +732,9 @@ export default {
     },
     handleSelectionChange(val) {
       this.multipleSelection = val
-      console.log(this.multipleSelection, 1111)
     },
     handleEditNumber(index, row) {
       this.dialogFormVisible3 = true
-      console.log(row, 123)
       this.NumberValue = row.组件零件基本件流水号
       this.form3.投产数量 = row.投产总数量
       this.AlreadyCastNumber = row.已投产数量 ? parseInt(row.已投产数量) : 0

src/views/ManufacturingCenter/ProcessingStatusNew/index.vue

@@ -39,11 +39,6 @@
                 {{ scope.row.工艺名称 }}
               </template>
             </el-table-column>
-            <!--<el-table-column align="center" label="已完数量" show-overflow-tooltip min-width="70">-->
-            <!--<template slot-scope="scope">-->
-            <!--{{ scope.row.完成数量 }}-->
-            <!--</template>-->
-            <!--</el-table-column>-->
             <el-table-column align="center" label="投产数" width="80">
               <template slot-scope="scope">
                 {{ scope.row.批次数量 }}
@@ -56,7 +51,7 @@
             </el-table-column>
             <el-table-column align="center" label="操作者" show-overflow-tooltip width="70">
               <template slot-scope="scope">
-                {{ scope.row.操作者 }}
+                {{ scope.row.工序间是否外协 === 1 ? (scope.row.操作者 === '超级管理员' ? '系统' : scope.row.操作者) : '外协' }}
               </template>
             </el-table-column>
             <el-table-column align="center" label="扫码开始" width="95">
@@ -571,7 +566,8 @@ export default {
               工序流水号: response.data[i].工序流水号,
               完成过程流水号: response.data[i].完成过程流水号,
               工序状态: response.data[i].工序状态,
-              完成数量: response.data[i].完成数量
+              完成数量: response.data[i].完成数量,
+              工序间是否外协: response.data[i].工序间是否外协
             })
           }
           this.loading2 = false

src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue

@@ -21,7 +21,7 @@
         <h3 style="display: inline-block;margin: 0 0 0 20px">客户名称:</h3>
         <el-input v-model="CustomerNameValue" placeholder="客户名称" size="small" clearable style="width:200px"/>
         <el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
-        <el-button size="small" style="margin: 0px 0px 3px 300px" type="warning" icon="el-icon-edit-outline" plain @click="editPro()">编辑</el-button>
+        <el-button size="small" style="margin: 0px 0px 3px 300px" type="warning" icon="el-icon-edit-outline" plain @click="editPro()">保存</el-button>
       </el-row>
       <el-row v-if="false">
         <h3 style="display: inline-block;margin: 0">签订日期:</h3>
@@ -32,12 +32,12 @@
         <el-date-picker v-model="time_deliveryFinish" size="small" value-format="yyyy-MM-dd" type="date" style="margin-top:10px;width: 180px" placeholder="交货期" class="time"/>
       </el-row>
     </el-card>
-
+    <el-row>
-    <el-card style="overflow: auto">
       <el-col style="width: 1400px;">
+        <el-card>
           <!--<h2 style="display: inline-block;margin: 0 0 10px 0">总计划:</h2>-->
-        <el-table v-loading="loading" :data="tableData" height="330" highlight-current-row style="margin-top: 5px;width: 100%;" border element-loading-text="拼命加载中" @row-click="rowClick">
+          <el-table v-loading="loading" :data="tableData" height="320" highlight-current-row style="margin-top: 5px;width: 100%;" border element-loading-text="拼命加载中" @row-click="rowClick">
-          <el-table-column label="项目编号" align="center" width="140px" fixed="left">
+            <el-table-column label="项目编号" align="center" width="170px" fixed="left">
               <template slot-scope="scope">
                 <template v-if="scope.row.edit">
                   <el-input v-model="scope.row.项目编号" size="mini"/>
@@ -62,7 +62,7 @@
                 {{ scope.row.机床名称 }}
               </template>
             </el-table-column>
-          <el-table-column label="机床数量" align="center" width="100px">
+            <el-table-column label="机床数量" align="center" width="80px">
               <template slot-scope="scope">
                 {{ scope.row.机床数量 }}
               </template>
@@ -106,8 +106,11 @@
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"/>
           </div>
+        </el-card>
       </el-col>
-      <el-col style="width: 200px;">
+
+      <el-col style="width: 290px;margin-left: 10px">
+        <el-card>
           <el-form label-position="left" label-width="90px" class="demo-ruleForm1">
             <el-row>
               <el-col style="width: 20px">
@@ -201,9 +204,10 @@
               </el-col>
             </el-row>
           </el-form>
-      </el-col>
         </el-card>
-
+      </el-col>
+    </el-row>
+    <el-row>
       <el-card>
         <h2 v-if="radio==='1'" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 发图</h2>
         <h2 v-if="radio==='2'" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 采购</h2>
@@ -318,6 +322,7 @@
           </el-table-column>
         </el-table>
       </el-card>
+    </el-row>
   </div>
 </template>
 
@@ -730,6 +735,16 @@ export default {
   .demo-ruleForm1 .el-form-item {
      margin-bottom: 0px
   }
+  .demo-ruleForm1 .el-form-item__label {
+    text-align: right;
+    float: left;
+    font-size: 16px;
+    color: #606266;
+    line-height: 40px;
+    padding: 0 12px 0 0;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+  }
   .bold-font .el-table{
     font: bold 20px arial!important;
     margin: 0 0 10px 0;

src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue

@@ -44,11 +44,11 @@
         <el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
       </el-row>
     </el-card>
-
+    <el-row>
-    <el-card style="overflow: auto">
       <el-col style="width: 1400px;">
-        <el-table v-loading="loading" :data="tableData" height="330" highlight-current-row style="margin-top: 5px;width: 100%;" border element-loading-text="拼命加载中" @row-click="rowClick">
+        <el-card>
-          <el-table-column label="项目编号" align="center" width="140px" fixed="left">
+          <el-table v-loading="loading" :data="tableData" height="320" highlight-current-row style="margin-top: 5px;width: 100%;" border element-loading-text="拼命加载中" @row-click="rowClick">
+            <el-table-column label="项目编号" align="center" width="170px" fixed="left">
               <template slot-scope="scope">
                 <template v-if="scope.row.edit">
                   <el-input v-model="scope.row.项目编号" size="mini"/>
@@ -73,7 +73,7 @@
                 {{ scope.row.机床名称 }}
               </template>
             </el-table-column>
-          <el-table-column label="机床数量" align="center" width="100px">
+            <el-table-column label="机床数量" align="center" width="80px">
               <template slot-scope="scope">
                 {{ scope.row.机床数量 }}
               </template>
@@ -117,8 +117,10 @@
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"/>
           </div>
+        </el-card>
       </el-col>
-      <el-col style="width: 240px;">
+      <el-col style="width: 290px;margin-left: 10px">
+        <el-card style="height: 370px">
           <div style="width: 80px;font-size: 18px;float: left;text-align: center;">进程</div>
           <div style="width: 80px;font-size: 18px;float: left;text-align: center;">计划时间</div>
           <div style="width: 80px;font-size: 18px;float: left;text-align: center;">实际时间</div>
@@ -208,9 +210,10 @@
               </el-col>
             </el-row>
           </el-form>
-      </el-col>
         </el-card>
-
+      </el-col>
+    </el-row>
+    <el-row>
       <el-card>
         <el-table v-loading="loading2" :data="tableData2" :row-class-name="tableRowClassName" style="margin-top: 10px;width: 100%;" border element-loading-text="拼命加载中">
           <el-table-column width="100px" label="计划名称" align="center">
@@ -260,6 +263,7 @@
           </el-table-column>
         </el-table>
       </el-card>
+    </el-row>
   </div>
 </template>
 
@@ -465,6 +469,16 @@ export default {
   }
 </style>
 <style>
+  .demo-ruleForm1 .el-form-item__label {
+    text-align: right;
+    float: left;
+    font-size: 16px;
+    color: #606266;
+    line-height: 40px;
+    padding: 0 12px 0 0;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+  }
   .PPMQHairDrawing{
     background: rgb(189,215,238) !important;
   }

src/views/MarketingCenter/BidBond/index.vue

@@ -798,7 +798,6 @@ export default {
       this.peoplename = ''
     },
     TakeBack(row) {
-      console.log(row, 1111)
       this.addForm('form1')
       this.timetime = row.投标日期
       this.form1.回收金额 = row.应收回金额

src/views/Outsourcing/OutsourcingPartsQuery/index.vue

@@ -179,8 +179,8 @@ export default {
         check2 = 1
       }
       searchTable(check, this.supplierNameValue, check1, this.MaterialsValue, check2, this.timer[0], this.timer[1], this.pageSize, this.pageCurrent).then(response => {
-        this.tableData = response.data.rows
+        this.tableData = response.data.result
-        this.total = response.data.total
+        this.total = parseInt(response.data.output[0].ItemCount)
         this.loading = false
       })
     },

src/views/Outsourcing/OutsourcingTaskExecution/index.vue

@@ -450,7 +450,6 @@ export default {
             })
             this.title = ''
             this.manufacturers = this.form.表单号
-            console.log(this.manufacturers, 111111)
             this.fetchData()
             this.dialogFormVisible = false
           } else {

src/views/Outsourcing/PreorderAssociation/index.vue

@@ -207,6 +207,7 @@ export default {
       this.tableData2 = []
       this.index2 = row.index
       searchTable2(row.工艺计划流水号).then(response => {
+        // 工序流水号 206794  工序状态 null
         this.num1 = row.工艺计划流水号
         if (response.data.length === 0) {
           this.loading0 = false
@@ -219,9 +220,9 @@ export default {
             }
           }
           for (let i = 0; i < response.data.length; i++) {
-            response.data[i].机加工开始时间 = response.data[i].机加工开始时间.split(' ')[0]
+            response.data[i].机加工开始时间 ? response.data[i].机加工开始时间.split(' ')[0] : ''
-            response.data[i].机加工结束时间 = response.data[i].机加工结束时间.split(' ')[0]
+            response.data[i].机加工结束时间 ? response.data[i].机加工结束时间.split(' ')[0] : ''
-            response.data[i].计划日期 = response.data[i].计划日期.split(' ')[0]
+            response.data[i].计划日期 ? response.data[i].计划日期 = response.data[i].计划日期.split(' ')[0] : ''
           }
           this.tableData2 = response.data
         }

src/views/PurchasingCenter/CreateInquirySheet/index.vue

@@ -1825,7 +1825,6 @@ export default {
     //   })
     // },
     saveOrder(row) { // 保存询价单
-      console.log(row, 1111)
       saveOrder(row.询价单明细流水号, row.数量, row.备注).then(response => {})
     },
     selectable(row, index) { // 控制某行是否可选

src/views/PurchasingCenter/OfflineContract/index.vue

@@ -1048,7 +1048,6 @@ export default {
       })
     },
     tabClick(tab) {
-      console.log(tab.name, 1111)
       if (tab.name === '外购件') {
         this.tabName = '外购件'
         this.searchTable11()
@@ -1371,7 +1370,6 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        console.log(row.离线合同明细流水号, 1111)
         deleteMateriel(row.离线合同明细流水号).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('移除成功')
@@ -1401,7 +1399,6 @@ export default {
       })
     },
     saveContract() {
-      console.log(11111)
       this.totalPrice = 0
       this.partGroup = []
       this.numGroup = []

src/views/PurchasingCenter/PurchaseSituationSearch/index.vue

@@ -426,7 +426,6 @@ export default {
     //     onClick: this.message(mess).then((res) => {
     //
     //     // this.message(mess)
-    //     console.log(res, 1111)
     //     this.$router.push({path: '/PurchasingCenter/PurchaseTaskAllocate'})
     //     // this.$router.push({ path: '/Inventory/MaterialOut' })
     //     // setTimeout(this.noticeContractKG.close(), 1000)

src/views/WorkshopProcurement/AccountingPrice/index.vue

@@ -170,7 +170,6 @@ export default {
     update(row) {
       console.log(row, 12)
       Preservation(row.采购合同明细流水号, row.单价).then(response => {
-        console.log(response, 1111)
         if (response.data[0].result === '1') {
           this.$message.success('编辑成功')
           // this.searchTable()

src/views/WorkshopProcurement/ExcelExport/index.vue

@@ -149,7 +149,6 @@ export default {
       xhr.responseType = 'blob'
       xhr.onload = function() {
         if (xhr.status === 200) {
-          console.log(xhr, 1111)
           const name = xhr.getResponseHeader('content-disposition').split('=')[1]
           cb(xhr.response, name)
         }