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

src/api/BasicData/MenuManagement.js

@@ -111,7 +111,7 @@ export function submitAdd(name) {
   })
 }
 // 查询二级模块分给那些角色
-export function searchJS(name) {
+export function getRoleTitle() {
   return request({
     url: '',
     method: 'post',
@@ -119,12 +119,25 @@ export function searchJS(name) {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '3',
-      name: ` select 角色功能,title from
+      name: ` select distinct title from
               基础表_模块信息 inner join 基础表_角色模块信息 on 基础表_角色模块信息.id = 基础表_模块信息.id
               inner join 菜单系统模块_项目角色 on 基础表_角色模块信息.角色编号 = 菜单系统模块_项目角色.角色编号
-              order by title`,
+              order by title`
-      param: `模块名称=${name}`
+    }
+  })
+}
+export function getRoleNameasd(name) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '3',
+      name: ` select distinct 角色功能 from
+              基础表_模块信息 inner join 基础表_角色模块信息 on 基础表_角色模块信息.id = 基础表_模块信息.id
+              inner join 菜单系统模块_项目角色 on 基础表_角色模块信息.角色编号 = 菜单系统模块_项目角色.角色编号
+              where title=\'${name}\'`
     }
   })
 }
-

src/views/BasicData/MenuManagement/index.vue

@@ -63,6 +63,7 @@
       <el-col :span="7">
         <el-card style="margin-bottom: 10px">
           <el-button size="small" type="distribution" @click="addSecondLevel">创建二级菜单</el-button>
+          <el-button size="small" style="float: right" type="success" @click="RoleNameasdShow=!RoleNameasdShow">模块分配情况</el-button>
         </el-card>
         <el-card>
           <div slot="header">
@@ -80,16 +81,22 @@
       </el-col>
     </el-row>
 
-    <el-row v-if="false">
+    <el-row v-show="RoleNameasdShow">
       <el-card>
         <div slot="header">
-          <el-input v-model="filterTextRight" size="small" placeholder="输入关键字进行过滤" clearable/>
+          <el-select v-model="TitleValue" placeholder="请选择" size="small" style="width:200px;margin-left:10px" filterable @change="getTitle">
+            <el-option
+              v-for="item in Title"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
         </div>
-        <el-table :data="secondLevelFilter" stripe size="mini" height="200" border>
+        <el-table :data="RoleNameasd" stripe size="mini" height="200" border style="width: 465px">
           <el-table-column label="序号" align="center" type="index" width="50"/>
-          <el-table-column align="center" label="模块名称">
+          <el-table-column align="center" label="模块名称" width="400">
             <template slot-scope="scope">
-              {{ scope.row.title }}
+              {{ scope.row.角色功能 }}
             </template>
           </el-table-column>
         </el-table>
@@ -114,7 +121,7 @@
 </template>
 
 <script>
-import { getRole, getModule, initFisrtLevel, initSecondLevel, returnModule, giveFirstLevel, giveSecondLevel, submitAdd } from '@/api/BasicData/MenuManagement'
+import { getRole, getModule, initFisrtLevel, initSecondLevel, returnModule, giveFirstLevel, giveSecondLevel, submitAdd, getRoleTitle, getRoleNameasd } from '@/api/BasicData/MenuManagement'
 export default {
   name: 'MenuManagement',
   data() {
@@ -140,7 +147,11 @@ export default {
       },
       rules1: {
         moduleName: [{ required: true, message: '请输入', trigger: ['blur', 'change'] }]
-      }
+      },
+      RoleNameasdShow: false,
+      TitleValue: '',
+      Title: [],
+      RoleNameasd: []
     }
   },
   watch: {
@@ -162,6 +173,7 @@ export default {
     this.getRoleName()
     this.initFisrtLevel()
     this.initSecondLevel()
+    this.getRoleTitle()
   },
   methods: {
     // 撤回分配模块
@@ -362,6 +374,23 @@ export default {
     filterNode(value, data) {
       if (!value) return true
       return data.label.indexOf(value) !== -1
+    },
+    // 初始化模块
+    getRoleTitle() {
+      getRoleTitle().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.Title.push({
+            value: response.data[i].title,
+            label: response.data[i].title
+          })
+        }
+      })
+    },
+    getTitle() {
+      this.RoleNameasd = []
+      getRoleNameasd(this.TitleValue).then(responmse => {
+        this.RoleNameasd = responmse.data
+      })
     }
   }
 }

src/views/ManufacturingCenter/SparePartsForScrap/index.vue

@@ -438,7 +438,6 @@ export default {
       }
     },
     tableRowClassName1({ row }) {
-      console.log(row)
       if (parseInt(row.报废数量) > parseInt(row.补投数量)) {
         return 'baofei'
       }
@@ -477,7 +476,6 @@ export default {
       this.remark1 = ''
       this.remark2 = ''
       this.PCNumber = parseInt(row.批次数量)
-      console.log(this.Number, 111)
       this.title = row.零件名称
       this.dialogeditVisible = true
       this.form.input1 = row.零件图号

src/views/ManufacturingCenter/StatusQuery/index.vue

@@ -90,7 +90,7 @@
 </template>
 
 <script>
-import { intPartState, searchTable, searchmachine, searchgroup } from '@/api/ManufacturingCenter/StatusQuery'
+import { searchTable, searchmachine, searchgroup } from '@/api/ManufacturingCenter/StatusQuery'
 export default {
   data() {
     return {
@@ -104,7 +104,22 @@ export default {
       partNumber: '', // 零件号
       partStateValue: null, // 零件状态
       partStateValue1: null,
-      partState: [], // 零件状态数组
+      partState: [{
+        value: 3,
+        label: '已投产'
+      }, {
+        value: 6,
+        label: '工艺完成'
+      }, {
+        value: 7,
+        label: '加工完成'
+      }, {
+        value: 8,
+        label: '入库'
+      }, {
+        value: 9,
+        label: '出库'
+      }], // 零件状态数组
       partTypeValue: null, // 零件类型
       num: null,
       pageCurrent: 1,
@@ -131,14 +146,14 @@ export default {
   },
   methods: {
     fetchData() {
-      intPartState().then(response => {
+      // intPartState().then(response => {
-        for (let i = 0; i < response.data.length; i++) {
+      //   for (let i = 0; i < response.data.length; i++) {
-          this.partState.push({
+      //     this.partState.push({
-            label: response.data[i].考核状态名称,
+      //       label: response.data[i].考核状态名称,
-            value: response.data[i].考核状态
+      //       value: response.data[i].考核状态
-          })
+      //     })
-        }
+      //   }
-      })
+      // })
       searchmachine().then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.machineTool.push({
@@ -180,10 +195,12 @@ export default {
           } else if (response.data.result[i].考核状态 === 5) {
             response.data.result[i].考核状态 = 2
           } else if (response.data.result[i].考核状态 === 6) {
-            response.data.result[i].考核状态 = 3
+            response.data.result[i].考核状态 = 2
           } else if (response.data.result[i].考核状态 === 7) {
-            response.data.result[i].考核状态 = 4
+            response.data.result[i].考核状态 = 3
           } else if (response.data.result[i].考核状态 === 8) {
+            response.data.result[i].考核状态 = 4
+          } else if (response.data.result[i].考核状态 === 9) {
             response.data.result[i].考核状态 = 5
           }
         }

src/views/ManufacturingCenter/TraceabilityOfParts/index.vue

@@ -140,7 +140,7 @@
           <el-divider content-position="right">跳转链接</el-divider>
           <el-row style="margin-left: 20px">
             <el-tooltip :open-delay="1000" effect="dark" content="转到零件状态查询模块" placement="top">
-              <el-button size="medium" type="text" @click="toStatusQuery">零件状态查询</el-button>
+              <el-button size="medium" type="text" @click="toStatusQuery">自制件状态查询</el-button>
             </el-tooltip>
             <el-divider direction="vertical"/>
             <!--<el-tooltip :open-delay="1000" effect="dark" content="转到加工进度查询模块" placement="top">-->
@@ -192,13 +192,13 @@ export default {
         type: '',
         size: 'large'
       }, {
-        id: 5,
+        id: 4,
         content: '工艺定额',
         timestamp: '工艺部：工艺员',
         type: '',
         size: 'large'
       }, {
-        id: 7,
+        id: 6,
         content: '生产加工',
         timestamp: '金工车间：操作工',
         type: '',
@@ -343,8 +343,8 @@ export default {
         }
       })
       SelectPart(0, '', 0, '', 0, '', 1, this.searchPick, 0, '', 0, '', 0, '', '', '', '').then(response => {
-        console.log(response, 8)
         for (let i = 0; i < this.activities.length; i++) {
+          console.log(response.data[0].考核状态.toString(), this.activities[i].id.toString())
           if (response.data[0].考核状态.toString() === this.activities[i].id.toString()) {
             for (let j = 0; j <= i; j++) {
               this.activities[j].type = 'success'
@@ -353,12 +353,10 @@ export default {
           }
         }
       })
-      console.log(item, 11)
       this.tableData1 = []
       gettabledata1(item.name).then(response => {
         if (response.data.length !== 0) {
           for (let i = 0; i < response.data.length; i++) {
-            console.log(response.data[i])
             this.tableData1.push({
               工艺名称: response.data[i].工艺名称,
               工序顺序: response.data[i].工序顺序,

src/views/WorkshopProcurement/ArrivalStateSearch/index.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="app-container">
     <el-card>
-      <span>合同号:</span>
       <el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable @change="searchTable">
         <el-option
           v-for="item in contractNum"
@@ -14,7 +13,7 @@
     </el-card>
 
     <el-card>
-      <el-table v-loading="" :data="tableData" stripe border style="width: 740px;margin-top: 10px" height="600px" size="mini">
+      <el-table v-loading="" :data="tableData" stripe border style="width: 980px;margin-top: 10px" height="600px" size="mini">
         <el-table-column label="采购合同编号" align="center" width="140">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 }}
@@ -40,6 +39,11 @@
             {{ scope.row.材料 ? scope.row.材料 : scope.row.物料规格 }}
           </template>
         </el-table-column>
+        <el-table-column label="采购时间" align="center" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.操作日期 }}
+          </template>
+        </el-table-column>
         <el-table-column label="采购总数量" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.数量 }}

src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue

@@ -54,6 +54,11 @@
                   {{ scope.row.材料 }}
                 </template>
               </el-table-column>
+              <el-table-column label="分配时间" prop="备料任务分配时间" width="120" align="center" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{ scope.row.备料任务分配时间 }}
+                </template>
+              </el-table-column>
             </el-table>
             <div v-show="false" class="block">
               <el-pagination

src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue

@@ -62,6 +62,11 @@
             {{ scope.row.申请人姓名 ? scope.row.申请人姓名 : '未提交' }}
           </template>
         </el-table-column>
+        <el-table-column label="创建时间" prop="操作时间" align="center" width="130">
+          <template slot-scope="scope">
+            {{ scope.row.操作时间 ? scope.row.操作时间.split(' ')[0] : '—' }}
+          </template>
+        </el-table-column>
         <el-table-column label="申请时间" prop="申请时间" align="center" width="130">
           <template slot-scope="scope">
             {{ scope.row.申请时间 ? scope.row.申请时间.split(' ')[0] : '—' }}

src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue

@@ -24,8 +24,8 @@
           format="yyyy-MM-dd"
           range-separator="～"
           style="width:250px"
-          start-placeholder="开始日期"
+          start-placeholder="合同创建时间"
-          end-placeholder="结束日期"/>
+          end-placeholder=" "/>
         <!--<span>审批情况:</span>-->
         <el-select v-model="approvalValue" placeholder="审批情况" size="small" clearable style="margin-left: 10px">
           <el-option
@@ -34,48 +34,24 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-button
+        <el-button type="primary" size="small" plain icon="el-icon-search" @click="total1=0;pageCurrent1=1;pageSize1=20;searchTable1()">查询</el-button>
-          type="primary"
+        <el-button type="primary" size="small" plain icon="el-icon-download" @click="exportExcel()">导出合同报表</el-button>
-          size="small"
-          plain
-          icon="el-icon-search"
-          @click="total1=0;pageCurrent1=1;pageSize1=20;searchTable1()">查询</el-button>
-        <el-button
-          type="primary"
-          size="small"
-          plain
-          icon="el-icon-download"
-          @click="exportExcel()">导出合同报表</el-button>
       </el-row>
     </el-card>
 
     <el-card>
-      <el-table
+      <el-table v-loading="loading1" :data="tableData1" :row-class-name="tableRowClassName" size="mini" border style="width: 100%" height="500px" highlight-current-row @row-click="searchTable2">
-        v-loading="loading1"
-        :data="tableData1"
-        :row-class-name="tableRowClassName"
-        size="mini"
-        border
-        style="width: 100%"
-        height="500px"
-        highlight-current-row
-        @row-click="searchTable2">
         <el-table-column label="采购合同号" align="center" width="170px">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购合同名称" align="center">
+        <el-table-column label="采购合同名称" align="center" width="120px">
           <template slot-scope="scope">
             {{ scope.row.采购合同名称 }}
           </template>
         </el-table-column>
-        <!--        <el-table-column label="规定到货时间" align="center">-->
+        <el-table-column label="供应商" align="center" width="180px">
-        <!--          <template slot-scope="scope">-->
-        <!--            {{ scope.row.规定到货时间 }}-->
-        <!--          </template>-->
-        <!--        </el-table-column>-->
-        <el-table-column label="供应商" align="center" width="200px">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
@@ -100,17 +76,27 @@
             {{ scope.row.付款金额 }}
           </template>
         </el-table-column>
+        <el-table-column label="创建时间" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.创建时间 }}
+          </template>
+        </el-table-column>
         <el-table-column label="审批情况" align="center">
           <template slot-scope="scope">
             {{ scope.row.审批情况内容 }}
           </template>
         </el-table-column>
-        <el-table-column label="未通过原因" align="center">
+        <el-table-column label="审批时间" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.审批时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="未通过原因" align="center" width="110px">
           <template slot-scope="scope">
             {{ scope.row.未通过原因 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" min-width="100px">
+        <el-table-column label="操作" align="center" width="150px">
           <template slot-scope="scope">
             <el-button type="text" size="mini" icon="el-icon-printer" @click="exportTable()">打印</el-button>
             <el-button :disabled="scope.row.审批情况内容==='通过审批'" type="text" size="mini" icon="el-icon-back" @click="Disable(scope.row)">打回</el-button>

src/views/WorkshopProcurement/ProjectTotalSearch/index.vue

@@ -26,6 +26,11 @@
     </el-card>
     <el-card style="width: 800px">
       <el-table v-loading="" :data="tableData2" :summary-method="getSummaries1" show-summary border style="width: 100%;max-height: 700px;" height="700px">
+        <el-table-column label="机床图号" align="center" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.机床图号 }}
+          </template>
+        </el-table-column>
         <el-table-column label="零件名称" align="center" width="150">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}

src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue

@@ -155,12 +155,7 @@
             {{ scope.row.采购合同名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="供应商" align="center" min-width="180">
+        <el-table-column label="采购员" align="center" width="120">
-          <template slot-scope="scope">
-            {{ scope.row.供应商名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="采购员" align="center" width="80">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>

src/views/layout/components/Navbar.vue

@@ -291,7 +291,6 @@ export default {
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .navbar {
-    min-width: 1380px;
     height: 50px;
     line-height: 50px;
     border-radius: 0px !important;

src/views/layout/components/TagsView.vue

@@ -63,27 +63,43 @@ export default {
       switch (this.$route.name) {
         case 'EquipmentMonitoring':
           document.getElementById('app-main').style.width = '1710px'
+          document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1710px'
+          document.getElementsByClassName('navbar')[0].style.minWidth = '1710px'
           break
         case 'ProjectPlanningManagementNew': // 项目计划管理
           document.getElementById('app-main').style.width = '1710px'
+          document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1710px'
+          document.getElementsByClassName('navbar')[0].style.minWidth = '1710px'
           break
         case 'ProjectPlanningManagementQuery': // 项目计划管理
           document.getElementById('app-main').style.width = '1710px'
+          document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1710px'
+          document.getElementsByClassName('navbar')[0].style.minWidth = '1710px'
           break
         case 'CreatingPurchasingMaterials': // 外购备料
           document.getElementById('app-main').style.width = '1865px'
+          document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1865px'
+          document.getElementsByClassName('navbar')[0].style.minWidth = '1865px'
           break
         case 'RequestOutsourcingMaterials': // 外购备料请款
           document.getElementById('app-main').style.width = '1710px'
+          document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1710px'
+          document.getElementsByClassName('navbar')[0].style.minWidth = '1710px'
           break
         case 'OutsourcingMaterialsInvoice': // 外购备料到票
           document.getElementById('app-main').style.width = '1480px'
+          document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1480px'
+          document.getElementsByClassName('navbar')[0].style.minWidth = '1480px'
           break
         case 'OfflineProcurement': // 外购备料(离线)
           document.getElementById('app-main').style.width = '1950px'
+          document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1950px'
+          document.getElementsByClassName('navbar')[0].style.minWidth = '1950px'
           break
         default:
           document.getElementById('app-main').style.width = '1380px'
+          document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1380px'
+          document.getElementsByClassName('navbar')[0].style.minWidth = '1380px'
       }
       if (this.$route.name) {
         return this.$route