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

src/views/Assembly/AssemblyQualityInspection/index.vue

@@ -176,8 +176,8 @@ export default {
       if (this.qualityInspectionValue !== '' && this.qualityInspectionValue !== null) { this.check4 = 1 } else { this.check4 = 0 }
       selecttable22(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.TestValue, this.check4, this.qualityInspectionValue).then(response => {
         import('@/vendor/Export2Excel').then(excel => {
-          const tHeader = ['是否合格', '机床图号', '机床名称', '组号', '部件名称', '检测项', '检测项明细', '备注']
+          const tHeader = ['检验情况', '机床图号', '机床名称', '组号', '部件名称', '检测项', '检测项明细', '质检时间', '质检员', '备注']
-          const filterVal = ['合格情况', '机床图号', '机床名称', '组号', '组件名称', '检测项', '检测项明细', '备注']
+          const filterVal = ['合格情况', '机床图号', '机床名称', '组号', '组件名称', '检测项', '检测项明细', '质检时间', '姓名', '备注']
           const list = response.data
           const data = this.formatJson(filterVal, list)
           excel.export_json_to_excel({

src/views/ManufacturingCenter/CreatePreparationBill/index.vue

@@ -8,10 +8,10 @@
             <el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=30; pageCurrent=1;searchTable()">查询</el-button>
             <el-tooltip :open-delay="1200" effect="dark" content="打印备料单" placement="top"/>
             <el-tooltip :open-delay="1200" effect="dark" content="将选中零件分配为外购备料" placement="top">
-              <el-button type="primary" size="small" icon="el-icon-s-shop" plain style="margin-left: 50px" @click="edit2()">外购备料</el-button>
+              <el-button :loading="edit2_loading" type="primary" size="small" icon="el-icon-s-shop" plain style="margin-left: 50px" @click="edit2()">外购备料</el-button>
             </el-tooltip>
             <el-tooltip :open-delay="1200" effect="dark" content="将选中零件分配为自家备料" placement="top">
-              <el-button type="distribution" size="small" icon="el-icon-setting" style="margin-left:20px" @click="edit('BL')">自家备料</el-button>
+              <el-button :loading="edit_loading" type="distribution" size="small" icon="el-icon-setting" style="margin-left:20px" @click="edit('BL')">自家备料</el-button>
             </el-tooltip>
             <el-tooltip :open-delay="1200" effect="dark" content="已导出和未导出备料单" placement="top">
               <el-checkbox v-model="all" size="small">查询全部</el-checkbox>
@@ -149,6 +149,8 @@ import $ from 'jquery'
 export default {
   data() {
     return {
+      edit2_loading: false,
+      edit_loading: false,
       a: 0,
       tableData2: [],
       partName: '',
@@ -233,7 +235,13 @@ export default {
       this.tableData2 = val
     },
     edit() {
+      this.edit_loading = true
+      var that = this
+      setTimeout(function() {
+        that.edit_loading = false
+      }, 5000)
       if (this.tableData2.length === 0) {
+        this.edit_loading = false
         this.$message.warning('暂无数据')
       } else {
         this.a = 0
@@ -250,8 +258,13 @@ export default {
       }
     },
     edit2() {
-      console.log(this.$store.state.user.id, 9090)
+      this.edit2_loading = true
+      var that = this
+      setTimeout(function() {
+        that.edit2_loading = false
+      }, 5000)
       if (this.tableData2.length === 0) {
+        this.edit2_loading = false
         this.$message.warning('暂无数据')
       } else {
         this.a = 0

src/views/ManufacturingCenter/InitialProduction/index.vue

@@ -186,13 +186,13 @@
             <el-checkbox v-model="checked_UrgentItem" style="margin-top:10px;margin-right:10px">是否加急</el-checkbox>
           </el-tooltip>
           <el-tooltip :open-delay="1200" effect="dark" content="选中零件进行备料投产" placement="top">
-            <el-button :loading="listLoading3" type="primary" size="small" plain @click="production10">备料投产</el-button>
+            <el-button :loading="production10_Loading" type="primary" size="small" plain @click="production10">备料投产</el-button>
           </el-tooltip>
           <el-tooltip :open-delay="1200" effect="dark" content="选中零件进行投产" placement="top">
-            <el-button :loading="listLoading3" type="warning" size="small" plain @click="production">投产</el-button>
+            <el-button :loading="production_Loading" type="warning" size="small" plain @click="production">投产</el-button>
           </el-tooltip>
           <el-tooltip :open-delay="1200" effect="dark" content="打回到零件分配" placement="top">
-            <el-button :loading="listLoading3" type="danger" size="small" style="margin-left: 10px" plain @click="back">打回</el-button>
+            <el-button :loading="back_Loading" type="danger" size="small" style="margin-left: 10px" plain @click="back">打回</el-button>
           </el-tooltip>
           <el-button icon="el-icon-circle-plus-outline" type="distribution" size="small" style="float:right;" @click="openUrgentItem()">加急件</el-button>
         </div>
@@ -394,6 +394,9 @@ import Cookie from 'js-cookie'
 export default {
   data() {
     return {
+      production10_Loading: false,
+      production_Loading: false,
+      back_Loading: false, // 20200427↑
       openUrgentItem_disable: false,
       checked_hebing: true,
       checked_UrgentItem: false,
@@ -984,18 +987,26 @@ export default {
     },
     // 投产
     production() {
+      this.production_Loading = true
+      var that = this
+      setTimeout(function() {
+        that.production_Loading = false
+      }, 5000)
       this.result = 0
       this.UrgentItem = 0
       if (this.time_machiningFinish === '' || this.time_machiningFinish === null) {
+        this.production_Loading = false
         this.$message.error('请输入加工结束时间')
       } else {
         this.shijiancuo1 = Date.parse(this.time_machiningStart)
         this.shijiancuo = Date.parse(this.time_machiningFinish)
         this.jieguo = this.shijiancuo1 - this.shijiancuo
         if (this.jieguo >= 0) {
+          this.production_Loading = false
           this.$message.error('加工结束时间应大于开始时间')
         } else {
           if (this.multipleSelection.length === 0) {
+            this.production_Loading = false
             this.$message.error('请至少选择一个零件')
           } else {
             if (this.checked_UrgentItem === true) {
@@ -1104,18 +1115,26 @@ export default {
     },
     // 备料投产
     production10() {
+      this.production10_Loading = true
+      var that = this
+      setTimeout(function() {
+        that.production10_Loading = false
+      }, 5000)
       this.result = 0
       this.UrgentItem = 0
       if (this.time_machiningFinish === '' || this.time_machiningFinish === null) {
+        this.production10_Loading = false
         this.$message.error('请输入加工结束时间')
       } else {
         this.shijiancuo1 = Date.parse(this.time_machiningStart)
         this.shijiancuo = Date.parse(this.time_machiningFinish)
         this.jieguo = this.shijiancuo1 - this.shijiancuo
         if (this.jieguo >= 0) {
+          this.production10_Loading = false
           this.$message.error('加工结束时间应大于开始时间')
         } else {
           if (this.multipleSelection.length === 0) {
+            this.production10_Loading = false
             this.$message.error('请至少选择一个零件')
           } else {
             if (this.checked_UrgentItem === true) {
@@ -1223,7 +1242,13 @@ export default {
       }
     },
     back() {
+      this.back_Loading = true
+      var that = this
+      setTimeout(function() {
+        that.back_Loading = false
+      }, 5000)
       if (this.multipleSelection.length === 0) {
+        this.back_Loading = false
         this.$message.error('请至少选择一个零件')
       } else {
         this.a = 0

src/views/ManufacturingCenter/PartAssignment/index.vue

@@ -198,15 +198,15 @@
         placeholder="选择交货期"/>
       <span style="font-weight: bold">制造:</span>
       <el-tooltip :open-delay="1200" effect="dark" content="将零件选择到采购单" placement="top">
-        <el-button type="primary" size="small" icon="el-icon-s-shop" plain style="margin-top: 3px; margin-left: 5px" @click="purchaseRequisition()">制造部采购</el-button>
+        <el-button :loading="purchaseRequisition_loading" type="primary" size="small" icon="el-icon-s-shop" plain style="margin-top: 3px; margin-left: 5px" @click="purchaseRequisition()">制造部采购</el-button>
       </el-tooltip>
       <span style="margin-left: 40px;font-weight: bold">金工:</span>
       <el-tooltip :open-delay="1200" effect="dark" content="所选零件分配为自家生产" placement="top">
-        <el-button type="danger" size="small" icon="el-icon-star-off" plain style="margin-top: 3px; margin-left: 5px" @click="Production()">车间生产</el-button>
+        <el-button :loading="Production_loading" type="danger" size="small" icon="el-icon-star-off" plain style="margin-top: 3px; margin-left: 5px" @click="Production()">车间生产</el-button>
       </el-tooltip>
       <span style="margin-left: 40px;font-weight: bold">采购:</span>
       <el-tooltip :open-delay="1200" effect="dark" content="所选零件分配到采购部" placement="top">
-        <el-button type="success" size="small" icon="el-icon-shopping-cart-full" plain style="margin-top: 3px; margin-left: 5px" @click="PurchasingDepartment()">采购部门采购</el-button>
+        <el-button :loading="PurchasingDepartment_loading" type="success" size="small" icon="el-icon-shopping-cart-full" plain style="margin-top: 3px; margin-left: 5px" @click="PurchasingDepartment()">采购部门采购</el-button>
       </el-tooltip>
     </el-card>
     <el-card style="padding: 3px;">
@@ -559,6 +559,9 @@ export default {
   inject: ['reload'],
   data() {
     return {
+      purchaseRequisition_loading: false,
+      Production_loading: false,
+      PurchasingDepartment_loading: false,
       handleAdd_disable: false,
       dateRange: '',
       partNumber: '',
@@ -1250,6 +1253,11 @@ export default {
       this.multipleSelection11 = val
     },
     purchaseRequisition() {
+      this.purchaseRequisition_loading = true
+      var that = this
+      setTimeout(function() {
+        that.purchaseRequisition_loading = false
+      }, 5000)
       if (this.RequisitionList !== '') {
         if (this.time !== '' && this.time !== null) {
           if (this.multipleSelection.length !== 0) {
@@ -1395,16 +1403,24 @@ export default {
               }
             }
           } else {
+            this.purchaseRequisition_loading = false
             this.$message.warning('请选择零件或物料')
           }
         } else {
+          this.purchaseRequisition_loading = false
           this.$message.warning('请选择交货期')
         }
       } else {
+        this.purchaseRequisition_loading = false
         this.$message.warning('请先选择请购单')
       }
     },
     PurchasingDepartment() {
+      this.PurchasingDepartment_loading = true
+      var that = this
+      setTimeout(function() {
+        that.PurchasingDepartment_loading = false
+      }, 5000)
       if (this.time !== '' && this.time !== null) {
         if (this.multipleSelection.length !== 0) {
           if (this.PartType === '基本件') {
@@ -1470,13 +1486,20 @@ export default {
             })
           }
         } else {
+          this.PurchasingDepartment_loading = false
           this.$message.warning('请选择零件或物料')
         }
       } else {
+        this.PurchasingDepartment_loading = false
         this.$message.warning('请选择交货期')
       }
     },
     Production() {
+      this.Production_loading = true
+      var that = this
+      setTimeout(function() {
+        that.Production_loading = false
+      }, 5000)
       if (this.PartType === '基本件' && this.multipleSelection.length !== 0) {
         this.MaterialNum = []
         this.BasicPartsNumber = []
@@ -1504,6 +1527,7 @@ export default {
           }
         })
       } else {
+        this.Production_loading = false
         this.$message.warning('请选择基本件')
       }
     },

src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue

@@ -32,7 +32,7 @@
       </el-row>
     </el-card>
     <el-row>
-      <el-col style="width: 1325px;">
+      <el-col style="width: 1315px;">
         <el-card>
           <!--<h2 style="display: inline-block;margin: 0 0 10px 0">总计划:</h2>-->
           <el-table v-loading="loading" :data="tableData" height="315" highlight-current-row style="margin-top: 5px;width: 100%;" border element-loading-text="拼命加载中" @row-click="rowClick">
@@ -795,7 +795,21 @@ export default {
       } else if (row.计划完成时间 < row.任务开始时间) {
         this.$message.error('计划完成时间应大于任务开始时间')
       } else {
-        if (row.组件流水号 && row.任务名称 && row.负责人 && row.接收任务时间 && row.任务开始时间 && row.计划完成时间 && row.货期) {
+        if (!row.组件流水号) {
+          this.$message.error('请选择分组')
+        } else if (!row.任务名称) {
+          this.$message.error('请输入任务名称')
+        } else if (!row.负责人) {
+          this.$message.error('请选择负责人')
+        } else if (!row.接收任务时间) {
+          this.$message.error('请选择接收任务时间')
+        } else if (!row.任务开始时间) {
+          this.$message.error('请选择任务开始时间')
+        } else if (!row.计划完成时间) {
+          this.$message.error('请选择计划完成时间')
+        } else if (!row.货期) {
+          this.$message.error('请输入货期')
+        } else {
           editTable2(row.组件计划流水号, row.组件流水号, row.任务名称, row.负责人, row.接收任务时间, row.任务开始时间, row.计划完成时间, row.货期, row.实际完成时间, row.备注).then(response => {
             if (response.data[0].result === '1') {
               row.edit = false
@@ -809,8 +823,6 @@ export default {
               this.$message.error('信息修改失败')
             }
           })
-        } else {
-          this.$message.error('请未输入项')
         }
       }
     },

src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue

@@ -45,7 +45,7 @@
       </el-row>
     </el-card>
     <el-row>
-      <el-col style="width: 1325px;">
+      <el-col style="width: 1315px;">
         <el-card>
           <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">

src/views/ManufacturingCenter/RequestApprovalQuery1/index.vue

@@ -66,6 +66,11 @@
             {{ scope.row.审核情况内容 }}
           </template>
         </el-table-column>
+        <el-table-column label="未过原因" align="center" min-width="60">
+          <template slot-scope="scope">
+            {{ scope.row.未通过审核原因 }}
+          </template>
+        </el-table-column>
         <el-table-column label="审批时间" align="center" min-width="60">
           <template slot-scope="scope">
             {{ scope.row.审批时间 ? scope.row.审批时间.split(' ')[0] : '' }}

src/views/PurchasingCenter/PurchaseSituationSearch/index.vue

@@ -338,7 +338,7 @@
           <el-table-column align="center" label="采购数量" width="100px">
             <template slot-scope="scope">
               {{ scope.row.采购数量 }}
-              {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.数量 || '—' }}
+              <!--{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.数量 || '—' }}-->
             </template>
           </el-table-column>
           <el-table-column align="center" label="到货数量" width="100px">

src/views/PurchasingCenter/ReceiveCheck/index.vue

@@ -326,7 +326,7 @@ export default {
       param[6] = ['机床号物料名称_check', check4]
       param[7] = ['机床号物料名称', this.machinenum]
       param[8] = ['合计', this.totalPrice]
-      param[9] = ['表名', '采购核算']
+      param[9] = ['表名', '领用核算']
       var Data = this.CreateData('2001', '采购管理_领用核算_查询数据_导出', param)
       this.exportExcel_NPOI(Data)
     }

src/views/layout/components/TagsView.vue

@@ -67,14 +67,14 @@ export default {
           document.getElementsByClassName('navbar')[0].style.minWidth = '1710px'
           break
         case 'ProjectPlanningManagementNew': // 项目计划管理
-          document.getElementById('app-main').style.width = '1710px'
+          document.getElementById('app-main').style.width = '1700px'
-          document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1710px'
+          document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1700px'
-          document.getElementsByClassName('navbar')[0].style.minWidth = '1710px'
+          document.getElementsByClassName('navbar')[0].style.minWidth = '1700px'
           break
-        case 'ProjectPlanningManagementQuery': // 项目计划管理
+        case 'ProjectPlanningManagementQuery': // 项目计划查询
-          document.getElementById('app-main').style.width = '1710px'
+          document.getElementById('app-main').style.width = '1700px'
-          document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1710px'
+          document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1700px'
-          document.getElementsByClassName('navbar')[0].style.minWidth = '1710px'
+          document.getElementsByClassName('navbar')[0].style.minWidth = '1700px'
           break
         case 'CreatingPurchasingMaterials': // 外购备料
           document.getElementById('app-main').style.width = '1865px'