更新

src/api/PurchasingCenter/MaterialManagement.js

@@ -1,5 +1,15 @@
 import request from '@/utils/request'
 
+export function AddGonghuoshang(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '4',
+      name: `insert into dbo.库存管理_供货商 (供货商) VALUES(\'${num}\')`
+    }
+  })
+}
 export function initDepartmentName() {
   return request({
     url: '',

src/utils/request.js

@@ -23,7 +23,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
 export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
 export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
 const service = axios.create({
-  baseURL: `http://192.168.0.101:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.0.103:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 export default service

src/views/ManufacturingCenter/GroupMatching/index.vue

@@ -437,34 +437,34 @@
         height="300"
         highlight-current-row
         border>
-        <el-table-column align="center" label="工序顺序" width="100">
+        <el-table-column align="center" label="工序顺序" width="80">
           <template slot-scope="scope">
             {{ scope.row.工序顺序 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="工艺名称" width="150">
+        <el-table-column align="center" label="工艺名称" width="110">
           <template slot-scope="scope">
             {{ scope.row.工艺名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="工艺要求">
+        <el-table-column align="center" label="工艺要求" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.工艺要求 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="计划日期">
+        <el-table-column align="center" label="计划日期" width="100">
           <template slot-scope="scope">
             {{ scope.row.计划日期 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="工艺是否完成" width="130">
+        <el-table-column align="center" label="工艺是否完成" width="100">
           <template slot-scope="scope">
             <el-tag v-if="parseInt(scope.row.工序状态)===4" type="success" size="small">已完成</el-tag>
             <el-tag v-if="parseInt(scope.row.工序状态)===5" type="warning" size="small">报废</el-tag>
             <el-tag v-if="parseInt(scope.row.工序状态)!==4 && parseInt(scope.row.工序状态)!==5" type="primary" size="small">未完成</el-tag>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="工艺是否质检" width="130">
+        <el-table-column align="center" label="工艺是否质检" width="100">
           <template slot-scope="scope">
             <el-tag v-if="parseInt(scope.row.是否质检)===1" type="success" size="small">合格</el-tag>
             <el-tag v-if="parseInt(scope.row.是否质检)===2" type="warning" size="small">不合格</el-tag>

src/views/ManufacturingCenter/ParseQuery/index.vue

@@ -3,134 +3,134 @@
     <el-card>
       <div class="main">
         <div class="process" @click.stop="chaxun">
-          <div id="son" :class="[isActive ? color[22] : 'weikaishi']" class="module" style="position: relative;left: 1588px;top:190px; width: 80px;height: 48px;">
+          <div id="son" :class="[isActive ? color[22] : 'weikaishi']" class="module" style="position: relative;left: 1543px;top:190px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">单击查看发货详情</div>
               <el-button :disabled="disabled" :class="[isActive ? color[22] : 'weikaishi']" type="text" @click.stop="searchDiv23">发货</el-button>
             </el-tooltip>
           </div>
-          <div id="son1" :class="[isActive ? color[21] : 'weikaishi']" class="module" style="position: relative;left: 1400px;top:190px; width: 80px;height: 48px;">
+          <div id="son1" :class="[isActive ? color[21] : 'weikaishi']" class="module" style="position: relative;left: 1355px;top:190px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">总装开始时间：{{ `${data2[0].总装调试}` }}<br>总装结束时间：{{ `${data2[0].机床装配实际完成时间}` }}</div>
               <el-button v-if="data2[0].总装调试状态===2" :disabled="disabled" :class="[isActive ? color[21] : 'weikaishi']" type="text" @click.stop="searchDiv22">总装调试<br>{{ `${data2[0].机床装配实际完成时间}` }}</el-button>
               <el-button v-else :disabled="disabled" :class="[isActive ? color[21] : 'weikaishi']" type="text" @click.stop="searchDiv22">总装调试<br>{{ `${data2[0].总装调试}` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son2" :class="[isActive ? color[20] : 'weikaishi']" class="module" style="position: relative;left: 1210px;top:190px; width: 80px;height: 48px;">
+          <div id="son2" :class="[isActive ? color[20] : 'weikaishi']" class="module" style="position: relative;left: 1168px;top:190px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">装配质检合格率：{{ `${data2[0].装配质检}%` }}</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[20] : 'weikaishi']" type="text" @click.stop="searchDiv21">装配质检<br>{{ `${data2[0].装配质检}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[20] : 'weikaishi']" type="text" @click.stop="searchDiv21">装配质检<br>{{ `${data2[0].装配质检 === 11111111 ? '-' : data2[0].装配质检}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son3" :class="[isActive ? color[19] : 'weikaishi']" class="module" style="position: relative;left: 1005px;top:62px; width: 80px;height: 48px;">
+          <div id="son3" :class="[isActive ? color[19] : 'weikaishi']" class="module" style="position: relative;left: 965px;top:62px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">电气装配计划完成率：{{ `${data2[0].电气装配}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[19] : 'weikaishi']" type="text" @click.stop="searchDiv6">电气装配<br>{{ `${data2[0].电气装配}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son4" :class="[isActive ? color[18] : 'weikaishi']" class="module" style="position: relative;left: 920px;top:140px; width: 80px;height: 48px;">
+          <div id="son4" :class="[isActive ? color[18] : 'weikaishi']" class="module" style="position: relative;left: 878px;top:140px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">机械装配计划完成率：{{ `${data2[0].机械装配}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[18] : 'weikaishi']" type="text" @click.stop="searchDiv5">机械装配<br>{{ `${data2[0].机械装配}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son5" :class="[isActive ? color[17] : 'weikaishi']" class="module" style="position: relative;left: 835px;top:220px; width: 80px;height: 48px;">
+          <div id="son5" :class="[isActive ? color[17] : 'weikaishi']" class="module" style="position: relative;left: 795px;top:220px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">冷作计划完成率：{{ `${data2[0].冷作}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[17] : 'weikaishi']" type="text" @click.stop="searchDiv7">冷作<br>{{ `${data2[0].冷作}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son6" :class="[isActive ? color[16] : 'weikaishi']" class="module" style="position: relative;left: 750px;top:300px; width: 80px;height: 48px;">
+          <div id="son6" :class="[isActive ? color[16] : 'weikaishi']" class="module" style="position: relative;left: 710px;top:300px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">油漆计划完成率：{{ `${data2[0].油漆}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[16] : 'weikaishi']" type="text" @click.stop="searchDiv8">油漆<br>{{ `${data2[0].油漆}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son7" :class="[isActive ? color[15] : 'weikaishi']" class="module" style="position: relative;left: 544px;top:190px; width: 80px;height: 48px;">
+          <div id="son7" :class="[isActive ? color[15] : 'weikaishi']" class="module" style="position: relative;left: 500px;top:190px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">成组配套率：{{ `${data2[0].成组配套}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[15] : 'weikaishi']" type="text" @click.stop="searchDiv9">成组配套<br>{{ `${data2[0].成组配套}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son8" :class="[isActive ? color[14] : 'weikaishi']" class="module" style="position: relative;left: 321px;top:95px; width: 80px;height: 48px;">
+          <div id="son8" :class="[isActive ? color[14] : 'weikaishi']" class="module" style="position: relative;left: 280px;top:95px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">自制质检合格率：{{ `${data2[0].自制质检}%` }}</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[14] : 'weikaishi']" type="text" @click.stop="searchDiv12">自制质检<br>{{ `${data2[0].自制质检}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[14] : 'weikaishi']" type="text" @click.stop="searchDiv12">自制质检<br>{{ `${data2[0].自制质检 === 11111111 ? '-' : data2[0].自制质检}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son9" :class="[isActive ? color[13] : 'weikaishi']" class="module" style="position: relative;left: 240px;top:286px; width: 80px;height: 48px;">
+          <div id="son9" :class="[isActive ? color[13] : 'weikaishi']" class="module" style="position: relative;left: 197px;top:286px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">采购质检合格率：{{ `${data2[0].采购质检}%` }}</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[13] : 'weikaishi']" type="text" @click.stop="searchDiv19">采购质检<br>{{ `${data2[0].采购质检 === 0 ? data2[0].采购质检 : '-'}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[13] : 'weikaishi']" type="text" @click.stop="searchDiv19">采购质检<br>{{ `${data2[0].采购质检 === 11111111 ? '-' : data2[0].采购质检}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son10" :class="[isActive ? color[12] : 'weikaishi']" class="module" style="position: relative;left: 30px;top:155px; width: 80px;height: 48px;">
+          <div id="son10" :class="[isActive ? color[12] : 'weikaishi']" class="module" style="position: relative;left: -10px;top:155px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">车间加工计划完成率：{{ `${data2[0].车间加工}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[12] : 'weikaishi']" type="text" @click.stop="searchDiv10">车间加工<br>{{ `${data2[0].车间加工}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son11" :class="[isActive ? color[11] : 'weikaishi']" class="module" style="position: relative;left: -133px;top:33px; width: 80px;height: 48px;">
+          <div id="son11" :class="[isActive ? color[11] : 'weikaishi']" class="module" style="position: relative;left: -175px;top:33px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">外协计划完成率：{{ `${data2[0].外协}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[11] : 'weikaishi']" type="text" @click.stop="searchDiv18">工序外协<br>{{ `${data2[0].外协}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son12" :class="[isActive ? color[10] : 'weikaishi']" class="module" style="position: relative;left: -335px;top:94px; width: 80px;height: 48px;">
+          <div id="son12" :class="[isActive ? color[10] : 'weikaishi']" class="module" style="position: relative;left: -378px;top:94px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">能力平衡计划完成率：{{ `${data2[0].能力平衡}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[10] : 'weikaishi']" type="text" @click.stop="searchDiv15">能力平衡<br>{{ `${data2[0].能力平衡}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son14" :class="[isActive ? color[8] : 'weikaishi']" class="module" style="position: relative;left: -520px;top:93px; width: 80px;height: 48px;">
+          <div id="son14" :class="[isActive ? color[8] : 'weikaishi']" class="module" style="position: relative;left: -560px;top:93px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">工艺定额计划完成率：{{ `${data2[0].工艺定额}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[8] : 'weikaishi']" type="text" @click.stop="searchDiv13">工艺定额<br>{{ `${data2[0].工艺定额}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son15" :class="[isActive ? color[7] : 'weikaishi']" class="module" style="position: relative;left: -728px;top:33px; width: 80px;height: 48px;">
+          <div id="son15" :class="[isActive ? color[7] : 'weikaishi']" class="module" style="position: relative;left: -766px;top:33px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">自家备料计划完成率：{{ `${data2[0].自家备料}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[7] : 'weikaishi']" type="text" @click.stop="searchDiv11">自家备料<br>{{ `${data2[0].自家备料}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son16" :class="[isActive ? color[0] : 'weikaishi']" class="module" style="position: relative;left: -1255px;top:236px; width: 80px;height: 48px;">
+          <div id="son16" :class="[isActive ? color[0] : 'weikaishi']" class="module" style="position: relative;left: -1295px;top:236px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">回款进度：{{ `${data2[0].签订合同}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[0] : 'weikaishi']" type="text" @click.stop="searchDiv1">签订合同<br>{{ `${data2[0].签订合同}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son17" :class="[isActive ? color[1] : 'weikaishi']" class="module" style="position: relative;left: -1240px;top:236px; width: 80px;height: 48px;">
+          <div id="son17" :class="[isActive ? color[1] : 'weikaishi']" class="module" style="position: relative;left: -1280px;top:238px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">产品设计计划完成率：{{ `${data2[0].产品设计}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[1] : 'weikaishi']" type="text" @click.stop="searchDiv2">产品设计<br>{{ `${data2[0].产品设计}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son18" :class="[isActive ? color[6] : 'weikaishi']" class="module" style="position: relative;left: -980px;top:155px; width: 80px;height: 48px;">
+          <div id="son18" :class="[isActive ? color[6] : 'weikaishi']" class="module" style="position: relative;left: -1020px;top:155px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">外购备料计划完成率：{{ `${data2[0].外购备料}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[6] : 'weikaishi']" type="text" @click.stop="searchDiv20">外购备料<br>{{ `${data2[0].外购备料}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son19" :class="[isActive ? color[2] : 'weikaishi']" class="module" style="position: relative;left: -1311px;top:236px; width: 80px;height: 48px;">
+          <div id="son19" :class="[isActive ? color[2] : 'weikaishi']" class="module" style="position: relative;left: -1350px;top:238px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">零件分配计划完成率：{{ `${data2[0].零件分配}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[2] : 'weikaishi']" type="text" @click.stop="searchDiv3">零件分配<br>{{ `${data2[0].零件分配}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son20" :class="[isActive ? color[3] : 'weikaishi']" class="module" style="position: relative;left: -1269px;top:103px; width: 80px;height: 48px;">
+          <div id="son20" :class="[isActive ? color[3] : 'weikaishi']" class="module" style="position: relative;left: -382px;top:55px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">自制投产计划完成率：{{ `${data2[0].自制件}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[3] : 'weikaishi']" type="text" @click.stop="searchDiv4">自制投产<br>{{ `${data2[0].自制件}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son21" :class="[isActive ? color[5] : 'weikaishi']" class="module" style="position: relative;left: -1354px;top:236px; width: 80px;height: 48px;">
+          <div id="son21" :class="[isActive ? color[5] : 'weikaishi']" class="module" style="position: relative;left: -468px;top:190px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">采购计划完成率：{{ `${data2[0].车间采购}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[5] : 'weikaishi']" type="text" @click.stop="searchDiv17">车间采购<br>{{ `${data2[0].车间采购}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son22" :class="[isActive ? color[4] : 'weikaishi']" class="module" style="position: relative;left: -1438px;top:328px; width: 80px;height: 48px;">
+          <div id="son22" :class="[isActive ? color[4] : 'weikaishi']" class="module" style="position: relative;left: -550px;top:282px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">采购计划完成率：{{ `${data2[0].采购部采购}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[4] : 'weikaishi']" type="text" @click.stop="searchDiv16">采购部采购<br>{{ `${data2[0].采购部采购}%` }}</el-button>
@@ -146,6 +146,7 @@
         <el-autocomplete
           v-model="searchCriteria"
           :fetch-suggestions="querySearch"
+          :disabled="loading0"
           clearable
           style="width: 200px;margin-left: 10px"
           size="small"
@@ -154,6 +155,7 @@
           @clear="clearMachine"
           @select="SearchMachine"/>
         <el-table
+          v-loading="loading0"
           :data="tableDataDiv0"
           height="340"
           style="width: 100%;min-height: 300px;"
@@ -1899,7 +1901,7 @@
                     {{ scope.row.机床图号 ? scope.row.机床图号 : '--' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="机床名称">
+                <el-table-column align="center" label="机床名称">1
                   <template slot-scope="scope">
                     {{ scope.row.机床名称 ? scope.row.机床名称 : '--' }}
                   </template>
@@ -1979,6 +1981,7 @@ export default {
       showDiv22: false,
       valueDiv1: null, // div1 客户评级
       maxDiv1: 6, // div1 客户评级最大值
+      loading0: false,
       tableDataDiv0: [],
       tableDataDiv2: [],
       tableDataDiv3: [],
@@ -2296,10 +2299,11 @@ export default {
       this.data2[0].冷作 = 0
       this.data2[0].油漆 = 0
       this.data2[0].装配质检 = 0
-      this.machineValue ? this.check = 1 : this.check = 0
+      this.SearchMachine1()
-      searchMachine(this.check, this.machineValue).then(response => {
+      // this.machineValue ? this.check = 1 : this.check = 0
-        this.tableDataDiv0 = response.data
+      // searchMachine(this.check, this.machineValue).then(response => {
-      })
+      //   this.tableDataDiv0 = response.data
+      // })
     },
     // 机床名称查询函数
     querySearch(queryString, cb) {
@@ -2333,8 +2337,10 @@ export default {
     },
     SearchMachine1() {
       this.machineValue ? this.check = 1 : this.check = 0
+      this.loading0 = true
       searchMachine(this.check, this.machineValue).then(response => {
         this.tableDataDiv0 = response.data
+        this.loading0 = false
       })
     },
     SearchMachine(item) {
@@ -2388,7 +2394,6 @@ export default {
         } else {
           response.data[0].总装调试 = response.data[0].总装调试.substring(5, 10)
         }
-        console.log(response.data[0].机床装配实际完成时间, 123)
         if (response.data[0].机床装配实际完成时间 === '1900-01-01 00:00:00') {
           response.data[0].机床装配实际完成时间 = '-'
         } else {
@@ -4546,7 +4551,7 @@ export default {
     text-align: center;
     margin-left: 0px;
     margin-top: 0px;
-    width: 1858px;
+    width: 1680px;
     height: 400px;
     /*border: 1px solid red;*/
     background: url('../../../assets/img/img15.png') repeat;

src/views/ManufacturingCenter/StatusQuery/index.vue

@@ -45,7 +45,7 @@
         <!--:label="item.label"-->
         <!--:value="item.value"/>-->
         <!--</el-select>-->
-        <el-button type="success" icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=10;total=0;searchData()">查询</el-button>
+        <el-button type="success" icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
       </el-row>
     </el-card>
     <el-card>
@@ -59,32 +59,32 @@
         highlight-current-row
         border>
         <el-table-column align="center" label="序号" type="index" width="55px"/>
-        <el-table-column align="center" label="机床图号" width="150px">
+        <el-table-column align="center" label="机床图号" width="110px">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="组号" width="120px">
+        <el-table-column align="center" label="组号" width="50px">
           <template slot-scope="scope">
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="零件图号" width="160px">
+        <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="120px">
+        <el-table-column align="center" label="零件名称" width="80px" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="数量" width="60px">
+        <el-table-column align="center" label="数量" width="50px">
           <template slot-scope="scope">
             {{ scope.row.批次数量 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="投产时间" width="130px">
+        <el-table-column align="center" label="投产时间" width="80px">
           <template slot-scope="scope">
             {{ scope.row.传递时间 }}
           </template>
@@ -273,11 +273,11 @@ export default {
       partTypeValue: null, // 零件类型
       num: null,
       pageCurrent: 1,
-      pageSize: 10,
+      pageSize: 20,
       pageCurrent1: 1,
-      pageSize1: 10,
+      pageSize1: 20,
       pageCurrent2: 1,
-      pageSize2: 10,
+      pageSize2: 20,
       tableData7: [],
       tableData6: [],
       tableData: [],
@@ -495,4 +495,7 @@ export default {
   .el-card{
     margin: 0px;
   }
+  .el-steps--simple {
+     padding: 0;
+  }
 </style>

src/views/PurchasingCenter/ArrivalStateSearch/index.vue

@@ -27,8 +27,8 @@
         :data="tableData1"
         border
         highlight-current-row
-        style="width: 100%;max-height: 250px;"
+        style="width: 100%"
-        height="250px"
+        height="400px"
         size="mini"
         @row-click="searchTable2">
         <el-table-column label="采购合同编号" align="center" min-width="100">
@@ -83,7 +83,7 @@
             {{ scope.row.采购合同编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="图号" align="center" min-width="100">
+        <el-table-column label="图号" align="center" width="200">
           <template slot-scope="scope">
             {{ scope.row.物料型号 ? scope.row.物料型号 : scope.row.零件图号 }}
           </template>
@@ -98,12 +98,12 @@
             {{ scope.row.物料规格 ? scope.row.物料规格 : scope.row.规格 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购总数量" align="center" min-width="100">
+        <el-table-column label="采购总数量" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.采购总数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="已到货数量" align="center" min-width="100">
+        <el-table-column label="已到货数量" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.已到货数量 }}
           </template>

src/views/PurchasingCenter/FundApproval2/index.vue

@@ -39,10 +39,10 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <el-button slot="reference" type="success" size="mini" icon="el-icon-search" style="margin-right: 10px" @click="searchTable01(scope.row)">查看详情</el-button>
+              <el-button slot="reference" plain size="mini" icon="el-icon-search" style="margin-right: 10px" @click="searchTable01(scope.row)">查看详情</el-button>
             </el-popover>
-            <el-button type="primary" size="mini" icon="el-icon-check" @click="yesApproval(scope.row)">通过</el-button>
+            <el-button type="warning" plain size="mini" icon="el-icon-check" @click="yesApproval(scope.row)">通过</el-button>
-            <el-button type="danger" size="mini" icon="el-icon-close" @click="noApproval(scope.row)">不通过</el-button>
+            <el-button type="danger" plain size="mini" icon="el-icon-close" @click="noApproval(scope.row)">不通过</el-button>
           </template>
         </el-table-column>
       </el-table>

src/views/PurchasingCenter/MaterialManagement/index.vue

@@ -100,7 +100,7 @@
             clearable
             @dblclick.native="param=0;openSupplier()"/>
         </el-col>
-        <el-col style="width: 330px">
+        <el-col style="width: 450px">
           <el-button
             type="success"
             icon="el-icon-search"
@@ -114,9 +114,10 @@
             type="warning"
             icon="el-icon-refresh"
             size="small"
-            style="margin:10px 10px 3px"
+            style="margin:10px 5px 3px"
             @click="CategoryMaintenance">维护物料类别
           </el-button>
+          <el-button type="primary" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="open()">新增供货商</el-button>
         </el-col>
       </el-row>
     </el-card>
@@ -193,7 +194,7 @@
       </div>
     </el-card>
 
-    <el-dialog :visible.sync="dialogFormVisible" title="选择供货商" center width="400px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="选择供货商" center width="400px">
       <el-input v-model="supplier1" placeholder="供货商" size="small" clearable style="width:200px"/>
       <el-button
         type="success"
@@ -230,7 +231,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="800px">
+    <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="800px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
         <el-row>
           <el-col :span="12">
@@ -336,7 +337,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog :visible.sync="dialogFormVisible2" title="物料类别维护" center width="1200px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="物料类别维护" center width="1200px">
       <div style="width: 47%;display: inline-block">
         <el-card>
           <span>物料类别:</span>
@@ -437,11 +438,28 @@
         </el-card>
       </div>
     </el-dialog>
+
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible3" title="新增供应商" center style="min-height: 300px" width="400px">
+      <el-form ref="form3" :model="form3" :rules="rules3" label-position="left" label-width="110px" class="demo-ruleForm">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="供货商名称" prop="供货商名称">
+              <el-input v-model="form3.供货商名称" placeholder="供货商名称" size="small" clearable style="width:200px"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible3=false">取消</el-button>
+        <el-button type="primary" @click="AddGonghuoshang('form3')">确定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import {
+  AddGonghuoshang,
   initDepartmentName,
   initMaterialCategory,
   initMaterialVariety,
@@ -466,6 +484,13 @@ import { mapGetters } from 'vuex'
 export default {
   data() {
     return {
+      form3: {
+        供货商名称: ''
+      },
+      rules3: {
+        供货商名称: [{ required: true, message: '请输入供货商名称', trigger: 'blur' }]
+      },
+      dialogFormVisible3: false,
       DepartmentValue: '', // 部门名称
       Department: [], // 部门数组
       MaterialCategoryValue: '', // 物料类别
@@ -554,6 +579,28 @@ export default {
     this.searchMaterialCategory()
   },
   methods: {
+    open() {
+      if (this.$refs['form3'] !== undefined) {
+        this.$refs['form3'].resetFields()
+      }
+      this.form3.供货商名称 = ''
+      this.dialogFormVisible3 = true
+    },
+    AddGonghuoshang(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          AddGonghuoshang(this.form3.供货商名称).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('添加成功')
+              this.dialogFormVisible3 = false
+            } else {
+              this.dialogFormVisible3 = false
+              this.$message.error('添加失败')
+            }
+          })
+        }
+      })
+    },
     fetchData() {
       this.getSelect(initDepartmentName, ['物料部门名称', '物料部门流水号'], 'Department') // 物料部门
       this.getSelect(initMeasurementUnit, ['计量单位', '计量单位流水号'], 'MeasurementUnit') // 计量单位

src/views/PurchasingCenter/PurchaseContractSearch/index.vue

@@ -75,11 +75,11 @@
         :data="tableData1"
         size="mini"
         border
-        style="width: 100%;max-height: 350px;"
+        style="width: 100%"
-        height="350px"
+        height="500px"
         highlight-current-row
         @row-click="searchTable2">
-        <el-table-column type="expand">
+        <el-table-column label="详情" type="expand">
           <template slot-scope="scope">
             <el-form label-position="left" inline class="demo-table-expand">
               <el-row>
@@ -110,7 +110,7 @@
             </el-form>
           </template>
         </el-table-column>
-        <el-table-column label="供应商" align="center" min-width="220">
+        <el-table-column label="供应商" align="center" width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
@@ -139,12 +139,12 @@
             <el-tag v-if="scope.row.审批情况内容==='不通过审批'" type="danger" size="small">未通过</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="未通过审核原因" align="center" min-width="150">
+        <el-table-column label="未通过审核原因" align="center" width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.未通过审核原因 ? scope.row.未通过审核原因 : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="未通过审批原因" align="center" min-width="150">
+        <el-table-column label="未通过审批原因" align="center" width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.未通过原因 ? scope.row.未通过原因 : '—' }}
           </template>
@@ -171,7 +171,7 @@
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="总金额" align="center" min-width="60">
+        <el-table-column label="总金额" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.合同总额 }}
           </template>

src/views/TechnologyCenter/ImportChangeParts/index.vue

@@ -1,6 +1,15 @@
 <template>
   <div class="app-container">
     <el-card v-loading="loading">
+      <el-col :span="6">
+        <el-steps :active="5" direction="vertical" style="height: 260px;margin-left: 50px">
+          <el-step title="选择项目"/>
+          <el-step title="选择类型"/>
+          <el-step title="浏览"/>
+          <el-step title="导入到数据库"/>
+          <el-step title="传递"/>
+        </el-steps>
+      </el-col>
       <div style="width: 620px;margin: 0 auto">
         <div style="overflow: hidden">
           <div style="margin-bottom: 10px;">

src/views/TechnologyCenter/ImportParts/UploadExcel/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="display: inline-block;width: 100%;height: 100%;margin: 10px 20px 40px 10px">
+  <div style="display: inline-block;width: 100%;height: 100%;margin-top: 5px">
     <input id="excel-upload-input" ref="excel-upload-input" type="file" multiple="multiple" accept=".xlsx, .xls" class="c-hide" @change="handkeFileChange">
     <div id="drop" @drop="handleDrop" @dragover="handleDragover" @dragenter="handleDragover">
       将Excel文件拖到这或

src/views/layout/components/Navbar.vue

@@ -64,7 +64,7 @@ export default {
       searchTable1(1, 999, 0, null, null, 0, 0, 0, 0, 0, 0).then(res => {
         if (res.data.total) {
           this.noticeContract = null
-          this.noticeContract = this.$notify.info({
+          this.noticeContract = this.$notify.success({
             title: '提示',
             message: '您有采购合同待审批，请及时处理，点击查看',
             onClick: () => {
@@ -87,7 +87,7 @@ export default {
       })
       Promise.race([p1, p2]).then(res => {
         if (res.data.total) {
-          this.noticeFund = this.$notify.info({
+          this.noticeFund = this.$notify.success({
             title: '提示',
             message: '您有合同请款申请待审批，请及时处理，点击查看',
             onClick: () => {
@@ -101,7 +101,7 @@ export default {
       searchTableInvoice(0, null, null, 1, 999, this.token).then(res => {
         if (res.data.total) {
           this.noticeInvoice = null
-          this.noticeInvoice = this.$notify.info({
+          this.noticeInvoice = this.$notify.success({
             title: '提示',
             message: '您有发票结算申请待审批，请及时处理，点击查看',
             onClick: () => {