Merge branch 'master' of ssh://192.168.0.149:29418/高精2.0

src/views/Inventory/Inboundscanning/index.vue

@@ -18,7 +18,7 @@
       <el-table
         v-loading="listLoading"
         :data="tableDataNum"
-        stripe="true"
+        stripe
         highlight-current-row
         border
         size="mini"

src/views/Inventory/OutPartSelect/index.vue

@@ -30,7 +30,7 @@
         v-loading="listLoading1"
         :data="tableData1"
         class="table"
-        stripe="true"
+        stripe
         size="mini"
         highlight-current-row
         border

src/views/Inventory/StockInquiry/index.vue

@@ -29,7 +29,7 @@
       <el-table
         v-loading="listLoading1"
         :data="tableData1"
-        stripe="true"
+        stripe
         size="mini"
         highlight-current-row
         class="table"

src/views/ManufacturingCenter/ActualTimeSupplement/index.vue

@@ -52,7 +52,7 @@
     <el-card>
       <el-table
         :data="tableData"
-        :stripe="true"
+        stripe
         height="550"
         size="mini"
         highlight-current-row

src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue

@@ -26,9 +26,9 @@
       <el-table
         :data="tableDataA"
         border
-        style="width: 100%;max-height: 450px;margin-top: 10px"
+        style="width: 100%;max-height: 450px"
+        stripe
         height="450px"
-        highlight-current-row
         size="small">
         <el-table-column
           type="index"
@@ -82,6 +82,18 @@
           @current-change="handleCurrentChange"/>
       </div>
     </el-card>
+    <!--<el-row>-->
+    <!--<el-col :xs="24" :sm="24" :lg="8">-->
+    <!--<el-card>-->
+    <!--<div id="myChart1" style="width: 1000px; height: 570px; margin: auto"/>-->
+    <!--</el-card>-->
+    <!--</el-col>-->
+    <!--<el-col :xs="24" :sm="24" :lg="8">-->
+    <!--<el-card>-->
+    <!--<div id="myChart2" style="width: 1000px; height: 570px; margin: auto"/>-->
+    <!--</el-card>-->
+    <!--</el-col>-->
+    <!--</el-row>-->
     <el-card style="width: 49.8%; float: left;margin-right: 5px">
       <div id="myChart1" style="width: 1000px; height: 570px; margin: auto"/>
     </el-card>
@@ -201,46 +213,48 @@ export default {
     searchData1() {
       getData2(this.MachineValue1, this.date1, this.date2).then(response => {
         this.table = response.data
-        console.log(this.table, 222)
       }).then(() => {
         this.drawLine()
-      })
-      if (this.date1 === null || this.date2 === null) {
-        this.$message.warning('请选择开始时间或结束时间')
-      } else {
-        const endYear = parseInt(this.date2.split('-')[0])
-        const startYear = parseInt(this.date1.split('-')[0])
-        const endMonth = parseInt(this.date2.split('-')[1])
-        const startMonth = parseInt(this.date1.split('-')[1])
-        const endDate = parseInt(this.date2.split('-')[2])
-        const startDate = parseInt(this.date1.split('-')[2])
-        let diff
-        if ((endMonth - startMonth) === 0) {
-          diff = endDate - startDate
-        }
-        if ((endMonth - startMonth) === 1) {
-          diff = endDate - startDate + 10
-        }
-        if ((endMonth - startMonth) > 1 || (endYear - startYear) !== 0) {
-          diff = 999
-        }
-        if (diff > 6) {
-          this.$message.warning('选择时间区间不得超过6天！')
+        if (!this.date1 || !this.date2) {
+          this.$message.warning('请选择开始时间或结束时间')
         } else {
-          searchState().then(response => {
-            for (let i = 0; i < response.data.length; i++) {
-              this.colors.push(response.data[i].颜色)
-              this.state.push(response.data[i].状态)
+          if (!this.MachineValue1) {
+            this.$message.warning('请选择工位')
+          } else {
+            const endYear = parseInt(this.date2.split('-')[0])
+            const startYear = parseInt(this.date1.split('-')[0])
+            const endMonth = parseInt(this.date2.split('-')[1])
+            const startMonth = parseInt(this.date1.split('-')[1])
+            const endDate = parseInt(this.date2.split('-')[2])
+            const startDate = parseInt(this.date1.split('-')[2])
+            let diff
+            if ((endMonth - startMonth) === 0) {
+              diff = endDate - startDate
             }
-          })
-          getData3(this.MachineValue1, this.date1, this.date2).then(response => {
-            this.table1 = response.data
-            console.log(this.table1)
-          }).then(() => {
-            this.drawLine3()
-          })
+            if ((endMonth - startMonth) === 1) {
+              diff = endDate - startDate + 10
+            }
+            if ((endMonth - startMonth) > 1 || (endYear - startYear) !== 0) {
+              diff = 999
+            }
+            if (diff > 6) {
+              this.$message.warning('选择时间区间不得超过6天！')
+            } else {
+              searchState().then(response => {
+                for (let i = 0; i < response.data.length; i++) {
+                  this.colors.push(response.data[i].颜色)
+                  this.state.push(response.data[i].状态)
+                }
+              })
+              getData3(this.MachineValue1, this.date1, this.date2).then(response => {
+                this.table1 = response.data
+              }).then(() => {
+                this.drawLine3()
+              })
+            }
+          }
         }
-      }
+      })
     },
     //  绘制图形
     drawLine() {
@@ -248,7 +262,6 @@ export default {
       const xData = []
       const lineData = []
       for (let i = 0; i < this.table.length; i++) {
-        console.log(this.table[i].日期, 1111)
         xData.push(this.table[i].日期.split(' ')[0])
         lineData.push(this.table[i].利用率.toFixed(2))
       }
@@ -304,8 +317,8 @@ export default {
       myChart.clear()
       myChart.setOption({
         title: {
-          text: '单台设备状态',
-          x: 350
+          text: this.MachineValue + '设备状态' + '(' + this.Time + ')',
+          x: 250
         },
         tooltip: {
           trigger: 'item',
@@ -344,8 +357,8 @@ export default {
       myChart.clear()
       myChart.setOption({
         title: {
-          text: '全员设备状态',
-          x: 350
+          text: '全员设备状态' + '(' + this.Time + ')',
+          x: 300
         },
         tooltip: {
           trigger: 'item',

src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue

@@ -28,7 +28,7 @@
         :data="tableData"
         :row-key="getRowKeys"
         :expand-row-keys="expands"
-        stripe="true"
+        stripe
         size="mini"
         highlight-current-row
         border

src/views/ManufacturingCenter/ParseQuery/index.vue

@@ -4447,7 +4447,7 @@ export default {
     font-weight: bold;
   }
   .el-card{
-    margin: 5px 10px 5px 10px;
+    margin: 0;
   }
   .showDiv{
     height: 380px;

src/views/ManufacturingCenter/ProcessingStatus/index.vue

@@ -48,7 +48,9 @@
           type="date"
           placeholder="选择日期"/>
         <el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="getTableData();pageCurrent=1;pageSize=10;total = 0">查询</el-button>
-        <el-button type="warning" class="el-icon-download" size="small" style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
+        <el-tooltip :open-delay="1000" effect="dark" content="导出所选机床的加工进度" placement="top">
+          <el-button type="warning" class="el-icon-download" size="small" style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
+        </el-tooltip>
       </el-row>
     </el-card>
 
@@ -392,9 +394,9 @@ export default {
       }
     }
   },
-  // created() {
-  //   this.getMachine()
-  // },
+  created() {
+    this.getMachine()
+  },
   methods: {
     formatJson(filterVal, jsonData) {
       return jsonData.map(v => filterVal.map(j => {

src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue

@@ -50,7 +50,7 @@
         v-loading="listLoading1"
         id="ProcessingStatusEdit"
         :data="tableData1"
-        :stripe="true"
+        stripe
         class="table"
         size="mini"
         highlight-current-row

src/views/ManufacturingCenter/StatusQuery/index.vue

@@ -17,7 +17,7 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <span>机床号:</span>
+        <span>机床图号:</span>
         <el-input v-model="machineToolNumber" placeholder="机床号" size="small" readonly clearable style="width:200px" @change="empty1">
           <el-button slot="append" icon="el-icon-search" @click="SearchMachine" />
         </el-input>
@@ -27,7 +27,7 @@
         </el-input>
       </el-row>
       <el-row>
-        <span>零件号:</span>
+        <span>零件图号:</span>
         <el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width:200px;margin-top: 10px"/>
         <span>零件状态:</span>
         <el-select v-model="partStateValue" placeholder="零件状态" size="small" clearable style="width:200px">
@@ -54,7 +54,7 @@
         :data="tableData"
         style="width: 100%;max-height: 600px"
         height="600"
-        stripe="true"
+        stripe
         size="mini"
         highlight-current-row
         border>
@@ -69,12 +69,12 @@
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="零件图号" min-width="160px">
+        <el-table-column align="center" label="零件图号" width="160px">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="零件名称" min-width="170px">
+        <el-table-column align="center" label="零件名称" width="120px">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
@@ -89,7 +89,7 @@
             {{ scope.row.传递时间 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="零件状态" width="750px">
+        <el-table-column align="center" label="零件状态" min-width="400px">
           <template slot-scope="scope">
             <el-steps :active="scope.row.考核状态" finish-status="success" simple>
               <el-step title="投产" />

src/views/ManufacturingCenter/machiningHoursStatistics/index.vue

@@ -21,7 +21,9 @@
           type="date"
           placeholder="选择日期"/>
         <el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;total = 0;searchTable();">查询</el-button>
-        <el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportUninquirySheet1()">导出</el-button>
+        <el-tooltip :open-delay="1000" content="一键删除交货期" placement="right">
+          <el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportUninquirySheet1()">导出</el-button>
+        </el-tooltip>
       </el-row>
     </el-card>
     <el-card>
@@ -32,7 +34,7 @@
           highlight-current-row
           height="380"
           size="mini"
-          stripe="true"
+          stripe
           style="width: 100%;"
           border
           element-loading-text="拼命加载中"
@@ -65,7 +67,7 @@
         </div>
       </el-col>
       <el-col :span="17" style="margin-left: 30px;">
-        <el-table v-loading="loading2" :data="tableData2" height="380" size="mini" stripe="true" highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
+        <el-table v-loading="loading2" :data="tableData2" height="380" size="mini" stripe highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
           <el-table-column label="零件图号" align="center" width="150px">
             <template slot-scope="scope">
               {{ scope.row.零件图号 }}
@@ -131,7 +133,7 @@
     </el-card>
     <el-card>
       <el-col :span="6">
-        <el-table v-loading="loading3" :data="tableData3" stripe="true" size="mini" highlight-current-row height="380" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable5">
+        <el-table v-loading="loading3" :data="tableData3" stripe size="mini" highlight-current-row height="380" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable5">
           <el-table-column label="机床编号" align="center" width="110px">
             <template slot-scope="scope">
               {{ scope.row.机床图号 }}
@@ -160,7 +162,7 @@
         </div>
       </el-col>
       <el-col :span="17" style="margin-left: 30px;">
-        <el-table v-loading="loading4" :data="tableData4" size="mini" height="380" stripe="true" highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
+        <el-table v-loading="loading4" :data="tableData4" size="mini" height="380" stripe highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
           <el-table-column label="机床编号" align="center">
             <template slot-scope="scope">
               {{ scope.row.机床图号 }}

src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue

@@ -167,9 +167,8 @@
         </el-table-column>
       </el-table>
       <el-button
-        type="primary"
+        type="shengcheng"
         size="small"
-        icon=""
         style="margin-top:10px"
         @click="calculateContractSum">计算合同总额</el-button>
       <span>合同总额(未税):</span>
@@ -187,9 +186,8 @@
           :value="item.value"/>
       </el-select>
       <el-button
-        type="primary"
+        type="shengcheng"
         size="small"
-        plain
         style="margin-left: 7.5%; margin-top: 10px"
         @click="doneContract">生成采购合同</el-button>
     </el-card>

src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue

@@ -87,7 +87,7 @@
           <el-button type="baocun" size="small" icon="el-icon-download" style="margin-left: 10px" @click="saveMateriel">保存</el-button>
         </el-tooltip>
       </div>
-      <el-table v-loading="" :data="tableData2" border stripe h style="max-height: 460px;" height="230px" size="mini" highlight-current-row @row-click="searchTable3">
+      <el-table v-loading="" :data="tableData2" border stripe style="max-height: 460px;" height="230px" size="mini" highlight-current-row @row-click="searchTable3">
         <el-table-column label="单号状态" align="center" width="100" fixed="left">
           <template slot-scope="scope">
             <el-tag v-if="Number(scope.row.采购计划状态)===0" type="warning" size="mini">编辑中</el-tag>

src/views/WorkshopProcurement/OfflineContract1/index.vue

@@ -124,7 +124,7 @@
           style="margin-left: 10px"
           @click="addOfflineContract">创建离线合同</el-button>
         <el-button
-          type="primary"
+          type="shengcheng"
           size="small"
           icon="el-icon-download"
           style="margin-left: 10px"

src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue

@@ -21,7 +21,7 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <el-tooltip effect="dark" content="查询外购备料发货信息" placement="top" open-delay="1200">
+      <el-tooltip :open-delay="1200" effect="dark" content="查询外购备料发货信息" placement="top">
         <el-button
           type="success"
           size="small"

src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue

@@ -16,7 +16,7 @@
         end-placeholder="结束日期"/>
       <span style="margin-left: 10px">供应商:</span>
       <el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/>
-      <el-tooltip effect="dark" content="查询外购备料清款信息" placement="top" open-delay="1200">
+      <el-tooltip :open-delay="1000" effect="dark" content="查询外购备料清款信息" placement="top">
         <el-button
           type="success"
           size="small"
@@ -24,7 +24,7 @@
           style="margin-left: 10px"
           @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
       </el-tooltip>
-      <el-tooltip effect="dark" content="对选择的请款任务创建请款申请" placement="top" open-delay="1200">
+      <el-tooltip :open-delay="1000" effect="dark" content="对选择的请款任务创建请款申请" placement="top">
         <el-button type="primary" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
       </el-tooltip>
     </el-card>