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

package.json

@@ -26,6 +26,7 @@
     "nprogress": "0.2.0",
     "qrcode": "^1.3.2",
     "time-formater": "^1.0.3",
+    "v-viewer": "^1.3.1",
     "vue": "2.5.17",
     "vue-router": "3.0.1",
     "vuex": "3.0.1",

src/api/Inventory/DirectPart.js

@@ -84,14 +84,14 @@ export function searchPeople(data1) {
   })
 }
 // 直达件增加
-export function addDirectPart(data1, data2, data3, data4, data5, data6, data7, data8, data9, data10, data11, data12, data13, data14) {
+export function addDirectPart(data1, data2, data3, data4, data5, data6, data7, data8, data9, data10, data11, data12, data13, data14, data15) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '库存管理_直达件_直达件增加',
-      param: '物料流水号=' + data1 + '&实际到货数量=' + data2 + '&货位流水号=' + data3 + '&采购合同明细流水号=' + data4 + '&入库人员流水号=' + data5 + '&领用者=' + data6 + '&出库数量=' + data7 + '&组件零件流水号=' + data8 + '&项目名称=' + data9 + '&机床名称=' + data10 + '&组件名称=' + data11 + '&物料名称=' + data12 + '&采购合同编号=' + data13 + '&备注=' + data14
+      param: '实际到货数量=' + data1 + '&采购合同明细流水号=' + data2 + '&入库人员流水号=' + data3 + '&领用者=' + data4 + '&出库数量=' + data5 + '&组件零件流水号=' + data6 + '&组件零件基本件流水号=' + data7 + '&项目流水号=' + data8 + '&机床流水号=' + data9 + '&组件流水号=' + data10 + '&名称=' + data11 + '&备注=' + data12 + '&物料型号=' + data13 + '&物料规格=' + data14 + '&零件图号=' + data15
     }
   })
 }

src/api/Inventory/InventoryCheck.js

@@ -42,7 +42,7 @@ export function searchPurchasePart(pageCurrent, pageSize, project_check, project
     method: 'post',
     data: {
       type: '1',
-      name: 'dbo.库存管理_库存盘点_外购件查询',
+      name: '库存管理_库存盘点_外购件查询',
       param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group,
       Pagination: pageCurrent + '&' + pageSize
     }
@@ -79,7 +79,7 @@ export function searchStandardPart(pageCurrent, pageSize, project_check, project
     method: 'post',
     data: {
       type: '1',
-      name: 'dbo.库存管理_库存盘点_标准件查询',
+      name: '库存管理_库存盘点_标准件查询',
       param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group,
       Pagination: pageCurrent + '&' + pageSize
     }
@@ -142,7 +142,7 @@ export function searchBasicPart(pageCurrent, pageSize, project_check, project, m
     method: 'post',
     data: {
       type: '1',
-      name: 'dbo.库存管理_库存盘点_基本件查询',
+      name: '库存管理_库存盘点_基本件查询',
       param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group,
       Pagination: pageCurrent + '&' + pageSize
     }
@@ -155,7 +155,7 @@ export function searchBasicPartIn(craftNumber) {
     method: 'post',
     data: {
       type: '1',
-      name: 'dbo.库存管理_库存盘点_基本件入库记录',
+      name: '库存管理_库存盘点_基本件入库记录',
       param: '工艺计划流水号=' + craftNumber
     }
   })
@@ -211,7 +211,7 @@ export function searchHoursePurchasePart(pageCurrent, pageSize, project_check, p
     }
   })
 }
-// 车间采购外购件查询
+// 车间采购库存盘点修改
 export function CheckAlter(receive, project, machinenumber, partnumber, oldnumber, reason, number, people, locate, contractdetail, alterdate, craftnumber, materialType, materiallocate) {
   return request({
     url: '',

src/api/Inventory/PartOut.js

@@ -44,7 +44,7 @@ export function PurchasePart(data1, data2, data3, data4, data5) {
     data: {
       type: '2',
       name: '库存管理_外购件出库_修改数据',
-      param: '组件零件流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5
+      param: '采购合同明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5
     }
   })
 }
@@ -68,7 +68,7 @@ export function WorkShopPart(data1, data2, data3, data4, data5) {
     data: {
       type: '2',
       name: '库存管理_车间采购出库_修改数据',
-      param: '采购合同明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5
+      param: '请购单明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5
     }
   })
 }

src/api/Inventory/PickingList.js

@@ -137,14 +137,14 @@ export function dropListDetail(DetailNumberx) {
   })
 }
 // 增加领料单明细
-export function addListDetail(PickingListNumberx, projectnumber, machinenumber, teamNumber, project, machine, team, materialName, materialNumber, materialType, outNumber, partType, Note, data1, data2, data3, data4, data5, data6, data7) {
+export function addListDetail(PickingListNumberx, projectnumber, machinenumber, teamNumber, outNumber, partType, Note, data1, data2, data4, data5, data6, data7, data8, data9, data10, data11, data12, data13) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '车间装配管理_领料单_领料单明细增加',
-      param: '领料单流水号=' + PickingListNumberx + '&项目流水号=' + projectnumber + '&机床流水号=' + machinenumber + '&组件流水号=' + teamNumber + '&项目名称=' + project + '&机床图号=' + machine + '&组号=' + team + '&物料名称=' + materialName + '&物料型号=' + materialNumber + '&物料规格=' + materialType + '&出库数量=' + outNumber + '&零件类型=' + partType + '&备注=' + Note + '&工艺计划流水号=' + data1 + '&收件信息ID=' + data2 + '&组件零件流水号=' + data3 + '&采购合同明细流水号=' + data4 + '&货位流水号=' + data5 + '&车间外购=' + data6 + '&物料与货位对照流水号=' + data7
+      param: '领料单流水号=' + PickingListNumberx + '&项目流水号=' + projectnumber + '&机床流水号=' + machinenumber + '&组件流水号=' + teamNumber + '&出库数量=' + outNumber + '&零件类型=' + partType + '&备注=' + Note + '&工艺计划流水号=' + data1 + '&收件信息ID=' + data2 + '&采购合同明细流水号=' + data4 + '&请购单明细流水号=' + data5 + '&货位流水号=' + data6 + '&出库类型=' + data7 + '&物料与货位对照流水号=' + data8 + '&名称=' + data9 + '&物料规格=' + data10 + '&物料型号=' + data11 + '&零件图号=' + data12 + '&材料=' + data13
     }
   })
 }

src/api/Inventory/SubstitutePart.js

@@ -48,13 +48,14 @@ export function searchPurchasePart(project_check, project, machine_check, machin
   })
 }
 // 被替换件查询
-export function searchSubstituted() {
+export function searchSubstituted(material_check, material) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '库存管理_替换件_被替换件查询'
+      name: '库存管理_替换件_被替换件查询',
+      param: '物料名称_check=' + material_check + '&物料名称=' + material
     }
   })
 }
@@ -95,14 +96,14 @@ export function deleteSubstitutedCard(data1) {
   })
 }
 // 增加替换件
-export function addSubstitutepart(data1, data2, data3, data4, data5, data6, data7, data8) {
+export function addSubstitutepart(data1, data2, data3, data4, data55, data5, data6, data7, data8) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '库存管理_替换件_零件替换',
-      param: '离线合同明细流水号=' + data1 + '&替换件采购合同明细流水号=' + data2 + '&替换单编号=' + data3 + '&替换件名称=' + data4 + '&被替换件名称=' + data5 + '&申请人=' + data6 + '&替换数量=' + data7 + '&备注=' + data8
+      param: '离线合同明细流水号=' + data1 + '&替换件采购合同明细流水号=' + data2 + '&替换单编号=' + data3 + '&替换件名称=' + data4 + '&被替换件货位流水号=' + data55 + '&被替换件名称=' + data5 + '&申请人=' + data6 + '&替换数量=' + data7 + '&备注=' + data8
     }
   })
 }

src/main.js

@@ -17,10 +17,17 @@ import curd from '@/utils/curd'
 import time from 'time-formater'
 
 import htmlToPdf from '@/vendor/htmlToPdf'
-
+import Viewer from 'v-viewer'
+import 'viewerjs/dist/viewer.css'
 Vue.use(curd)
 Vue.use(htmlToPdf)
 Vue.use(ElementUI)
+// 查看图片
+Vue.use(Viewer)
+Viewer.setDefaults({
+  Options: { 'inline': true, 'button': true, 'navbar': true, 'title': true, 'toolbar': true, 'tooltip': true, 'movable': true, 'zoomable': true, 'rotatable': true, 'scalable': true, 'transition': true, 'fullscreen': true, 'keyboard': true, 'url': 'data-source' }
+})
+
 // 处理时间字符串格式全局过滤器 '2018/1/23 00:00:00' to '2018-01-23'
 Vue.filter('formatTime', function(value) {
   if (!value) return ''

src/views/Inventory/DirectPart/index.vue

@@ -40,6 +40,7 @@
         v-loading="listLoading"
         :data="tableDataPurchase"
         border
+        size="mini"
         style="width: 100%;"
         height="200">
         <el-table-column
@@ -74,8 +75,8 @@
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="120">
           <template slot-scope="scope" align="center">
-            <el-button size="small" type="primary" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="addDirect(scope.row)">直达</el-button>
+            <el-button size="mini" type="primary" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="addDirect(scope.row)">直达</el-button>
-            <el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 0px" @click="searchDirect(scope.row)">选择</el-button>
+            <el-button size="mini" type="primary" icon="el-icon-edit" style="margin: 0 0 0 0px" @click="searchDirect(scope.row)">选择</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -95,6 +96,7 @@
         v-loading="listLoading1"
         :data="directRecord"
         border
+        size="mini"
         style="width: 100%;"
         height="200">
         <el-table-column

src/views/Inventory/Inboundscanning/index.vue

@@ -1,7 +1,5 @@
 <template>
-
   <div class="app-container">
-
     <el-card>
       <span style="margin: 5px">零件图号</span>
       <el-input v-model="Partpaint" clearable size="small" style="width:200px" />
@@ -13,6 +11,7 @@
         v-loading="listLoading"
         :data="tableData"
         border
+        size="mini"
         style="width: 100%;height: 650px" >
         <el-table-column
           label="序号"

src/views/Inventory/InventoryCheck/index.vue

@@ -245,7 +245,7 @@
             </el-table-column>
             <el-table-column label="操作" align="center" min-width="120">
               <template slot-scope="scope" align="center">
-                <el-button size="small" type="warning" icon="el-icon-tickets" style="margin: 0 0 0 0px" @row-click="searchGeneralPartRecord(scope.row)">选择</el-button>
+                <el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 0px" @row-click="searchGeneralPartRecord(scope.row)">设置</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -379,7 +379,8 @@
             border
             size="mini"
             style="width: 100%;"
-            height="200">
+            height="200"
+            @row-click="searchPurchasePartRecord">
             <el-table-column
               label="序号"
               align="center"
@@ -417,7 +418,7 @@
             </el-table-column>
             <el-table-column label="操作" align="center" min-width="120">
               <template slot-scope="scope" align="center">
-                <el-button size="small" type="warning" icon="el-icon-tickets" style="margin: 0 0 0 0px" @click="searchPurchasePartRecord(scope.row)">选择</el-button>
+                <el-button size="small" type="warning" icon="el-icon-edit" style="margin: 0 0 0 0px" @click="AlterNumber(scope.row)">设置</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -535,7 +536,8 @@
             size="mini"
             border
             style="width: 100%;"
-            height="200">
+            height="200"
+            @row-click="standardselecting">
             <el-table-column
               label="序号"
               align="center"
@@ -578,7 +580,7 @@
             </el-table-column>
             <el-table-column label="操作" align="center" width="200px">
               <template slot-scope="scope" align="center">
-                <el-button size="mini" type="warning" icon="el-icon-tickets" style="margin: 0 0 0 0px" @click="standardselecting(scope.row)" >选择</el-button>
+                <el-button size="mini" type="warning" icon="el-icon-edit" style="margin: 0 0 0 0px" @click="AlterNumber(scope.row)" >设置</el-button>
                 <el-button size="mini" type="primary" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="changesafeAmount(scope.row)">修改</el-button>
               </template>
             </el-table-column>
@@ -649,7 +651,8 @@
             border
             size="mini"
             style="width: 100%;"
-            height="200">
+            height="200"
+            @row-click="searchPurchasePartRecord">
             <el-table-column
               label="序号"
               align="center"
@@ -687,7 +690,7 @@
             </el-table-column>
             <el-table-column label="操作" align="center" min-width="120">
               <template slot-scope="scope" align="center">
-                <el-button size="small" type="warning" icon="el-icon-tickets" style="margin: 0 0 0 0px" @click="searchPurchasePartRecord(scope.row)">选择</el-button>
+                <el-button size="small" type="warning" icon="el-icon-edit" style="margin: 0 0 0 0px" @click="AlterNumber(scope.row)">设置</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -863,7 +866,8 @@
             border
             size="mini"
             style="width: 100%;"
-            height="200">
+            height="200"
+            @row-click="HouseBasicRecord">
             <el-table-column
               label="序号"
               align="center"
@@ -906,7 +910,7 @@
             </el-table-column>
             <el-table-column label="操作" align="center" min-width="80">
               <template slot-scope="scope" align="center">
-                <el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="HouseBasicRecord(scope.row)">选择</el-button>
+                <el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="AlterNumber(scope.row)">设置</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -1021,7 +1025,8 @@
             border
             size="mini"
             style="width: 100%;"
-            height="200">
+            height="200"
+            @row-click="HousePurchaseRecord">
             <el-table-column
               label="序号"
               align="center"
@@ -1069,7 +1074,7 @@
             </el-table-column>
             <el-table-column label="操作" align="center" min-width="80">
               <template slot-scope="scope" align="center">
-                <el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="HousePurchaseRecord(scope.row)">选择</el-button>
+                <el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="AlterNumber(scope.row)">设置</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -1721,7 +1726,6 @@ export default {
       this.dialogFormVisible = true
     },
     submitChannge() {
-      console.log(this.receive, this.project, this.machinenumber, this.partnumber, this.oldnumber, this.form2.AlterReason, this.form2.Number, this.id, this.locate, this.contractdetail, this.craftnumber, this.materialType, this.materiallocate)
       CheckAlter(this.receive, this.project, this.machinenumber, this.partnumber, this.oldnumber, this.form2.AlterReason, this.form2.Number, this.id, this.locate, this.contractdetail, this.craftnumber, this.materialType, this.materiallocate).then(response => {
         if (response.data[0].result === '1') {
           this.$message.success('修改成功')

src/views/Inventory/InventoryManagement/index.vue

@@ -7,6 +7,7 @@
       <el-table
         :data="tableData"
         border
+        size="mini"
         style="width: 100%;max-height: 400px"
         height="400"
         @row-click="getWarehouse">
@@ -40,7 +41,7 @@
             {{ scope.row.备注 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" min-width="100" align="center" fixed="right">
+        <el-table-column label="操作" min-width="200" align="center" fixed="right">
           <template slot-scope="scope">
             <el-button
               size="mini"
@@ -52,18 +53,17 @@
               type="danger"
               icon="el-icon-delete"
               @click="handleDelete(scope.row)">删除</el-button>
+            <el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="ADDLocate()">增加货位</el-button>
           </template>
         </el-table-column>
       </el-table>
     </el-card>
-    <el-card>
-      <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="ADDLocate()">增加</el-button>
-    </el-card>
     <el-card>
       <el-table
         v-loading="listLoading"
         :data="tableData2"
         border
+        size="mini"
         style="width: 100%;max-height: 400px"
         height="400">
         <el-table-column label="货位名称" align="center" width="200">

src/views/Inventory/PartOut/index.vue

@@ -64,7 +64,7 @@
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="领用数量" align="center" width="50">
+        <el-table-column label="领用数量" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.出库数量 }}
           </template>
@@ -91,8 +91,8 @@
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="200">
           <template slot-scope="scope">
-            <el-button :disabled="scope.row.是否出库" size="small" type="danger" icon="el-icon-back" style="margin: 0 0 0 0px" @click="ErrorpartOut(scope.row)">异常</el-button>
+            <el-button :disabled="scope.row.是否出库" size="mini" type="danger" icon="el-icon-back" style="margin: 0 0 0 0px" @click="ErrorpartOut(scope.row)">异常</el-button>
-            <el-button :disabled="scope.row.是否出库" size="small" type="primary" icon="el-icon-back" style="margin: 0 0 0 0px" @click="partOut(scope.row)">出库</el-button>
+            <el-button :disabled="scope.row.是否出库" size="mini" type="primary" icon="el-icon-back" style="margin: 0 0 0 0px" @click="partOut(scope.row)">出库</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -209,6 +209,7 @@ export default {
           data[i].是否出库 === '1' ? data[i].是否禁用 = true : data[i].是否禁用 = false
         }
         this.tableDataPicking = data
+        console.log(this.tableDataPicking)
         this.listLoading1 = false
       })
     },
@@ -221,17 +222,16 @@ export default {
     },
     // 出库
     partOut(row) {
-      console.log(row)
+      if (row.出库类型 === 3) {
-      if (row.车间外购 === 1) {
+        WorkShopPart(row.请购单明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.备注).then(response => {
-        WorkShopPart(row.采购合同明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.备注).then(response => {
           if (response.data[0].result === '1') {
             ListDetailOut(row.领料单明细流水号)
             this.$message.success('出库成功')
             this.searchListDetailt()
           } else { this.$message.error('出库失败') }
         })
-      } else if (row.零件类型 === 1 || row.零件类型 === 2) {
+      } else if (row.出库类型 === 2) {
-        PurchasePart(row.组件零件流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.备注).then(response => {
+        PurchasePart(row.采购合同明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.备注).then(response => {
           if (response.data[0].result === '1') {
             ListDetailOut(row.领料单明细流水号)
             this.$message.success('出库成功')

src/views/Inventory/PickingList/index.vue

@@ -64,9 +64,9 @@
           align="center"
           type="index"
           width="50"/>
-        <el-table-column label="物料名称" align="center" min-width="100">
+        <el-table-column label="名称" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.物料名称 }}
+            {{ scope.row.名称 }}
           </template>
         </el-table-column>
         <el-table-column label="物料型号" align="center" min-width="100">
@@ -182,7 +182,7 @@
             {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="数量" align="center" min-width="40">
+        <el-table-column label="计划数量" align="center" min-width="40">
           <template slot-scope="scope">
             {{ scope.row.批次数量 }}
           </template>
@@ -275,7 +275,7 @@
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="数量" align="center" min-width="80">
+        <el-table-column label="合同数量" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.数量 }}
           </template>
@@ -320,6 +320,7 @@
         v-loading="listLoadingx"
         :data="tableDataHouse"
         border
+        size="mini"
         style="width: 100%;"
         height="200">
         <el-table-column
@@ -357,9 +358,9 @@
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="数量" align="center" min-width="80">
+        <el-table-column label="合同数量" align="center" min-width="80">
           <template slot-scope="scope">
-            {{ scope.row.数量 }}
+            {{ scope.row.零件数量 }}
           </template>
         </el-table-column>
         <el-table-column label="零件数量" align="center" min-width="80">
@@ -583,13 +584,17 @@ export default {
       pickingListDetail: '',
       tableDataHouse: [],
       listLoadingx: '',
-      purchaseDetailNum: '',
+      purchaseDetailNum: '', // 采购合同明细流水号
+      askPurchaseNumber: '', // 请购单明细流水号
       dialogFormVisibleWork: false,
       time: [],
       materialLocate: '',
       enableOut: '',
       pickingListNumber_check: 1,
-      outNumber: ''
+      outNumber: '',
+      outType: '',
+      material: '', // 材料
+      partPiant: '' // 零件图号
     }
   },
   computed: {
@@ -664,7 +669,6 @@ export default {
           }
         }
         this.tableDataPurchase = response.data.rows
-        console.log(this.tableDataPurchase, 124124)
         this.listLoading = false
         this.total1 = response.data.total
       })
@@ -813,6 +817,7 @@ export default {
     // 增加基本件领料单明细
     addBasicListDetailinfor(row) {
       this.form = []
+      this.outType = 1
       this.partProjectNumber = row.项目流水号
       this.partProjectName = row.项目名称
       this.partMachineNumber = row.机床流水号
@@ -827,11 +832,8 @@ export default {
       this.materialName = row.零件名称
       this.materialNumber = row.零件图号
       this.dialogFormVisible1 = true
-      this.materialName = row.零件名称
       this.materialType = row.零件类型名称
-      this.materialNumber = row.零件图号
       this.enableOut = row.可出库数量
-      this.purchaseDetailNum = row.采购合同明细流水号
     },
     addBasicListDetail(formName) {
       if (this.pickingListNumberx === '') {
@@ -841,7 +843,7 @@ export default {
       } else {
         this.$refs[formName].validate((valid) => {
           if (valid) {
-            addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialNumber, this.materialType, this.form.OutNumber, this.partType, this.form.outNote, this.craftplannumber, this.receive, this.teamPart, this.purchaseDetailNum, this.locatenumber, 0, this.materialLocate).then(response => {
+            addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.form.OutNumber, this.partType, this.form.outNote, this.craftplannumber, this.receive, this.purchaseDetailNum, this.askPurchaseNumber, this.locatenumber, this.outType, this.materialLocate, this.materialName, this.materialType, this.materialNumber, this.materialNumber, this.material).then(response => {
               if (response.data[0].result === '1') {
                 this.$message.success('增加成功')
                 this.searchPartinfo()
@@ -859,6 +861,7 @@ export default {
     // 增加外购件领料单明细
     addListDetailinfor(row) {
       this.form = []
+      this.outType = 2
       this.partProjectNumber = row.项目流水号
       this.partProjectName = row.项目名称
       this.partMachineNumber = row.机床流水号
@@ -874,6 +877,8 @@ export default {
       this.materialNumber = row.物料型号
       this.materialType = row.物料规格
       this.dialogFormVisible = true
+      this.partPiant = row.零件图号
+      this.material = row.材料
       this.purchaseDetailNum = row.采购合同明细流水号
       this.materialLocate = row.物料与货位对照流水号
       this.enableOut = row.货位存量 - row.待出库数量
@@ -887,7 +892,7 @@ export default {
       } else {
         this.$refs[formName].validate((valid) => {
           if (valid) {
-            addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form2.OutNumber, this.partType, this.form2.outNote, this.craftplannumber, this.receive, this.teamPart, this.purchaseDetailNum, this.locatenumber, 0, this.materialLocate).then(response => {
+            addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.form2.OutNumber, this.partType, this.form2.outNote, this.craftplannumber, this.receive, this.purchaseDetailNum, this.askPurchaseNumber, this.locatenumber, this.outType, this.materialLocate, this.materialName, this.materialType, this.materialNumber, this.partPiant, this.material).then(response => {
               if (response.data[0].result === '1') {
                 this.$message.success('增加成功')
                 this.searchPartinfo()
@@ -905,23 +910,22 @@ export default {
     // 增加车间采购领料单明细
     addWorkshopDetailinfor(row) {
       this.form = []
+      this.outType = 3
+      console.log(row)
       this.partProjectNumber = row.项目流水号
-      this.partProjectName = row.项目名称
       this.partMachineNumber = row.机床流水号
-      this.partMachineName = row.机床图号
       this.partGroupNumber = row.组件流水号
-      this.partGroupName = row.组号
       this.partType = row.零件类型
-      this.receive = row.收件信息ID
       this.locatenumber = row.货位流水号
+      this.dialogFormVisibleWork = true
+      this.askPurchaseNumber = row.请购单明细流水号
+      this.materialLocate = row.物料与货位对照流水号
+      this.enableOut = row.货位存量
       this.materialName = row.物料名称
       this.materialNumber = row.物料型号
       this.materialType = row.物料规格
-      this.dialogFormVisibleWork = true
+      this.partPiant = row.零件图号
-      this.purchaseDetailNum = row.采购合同明细流水号
+      this.material = row.材料
-      this.materialLocate = row.物料与货位对照流水号
-      this.enableOut = row.货位存量
-      console.log(this.enableOut)
     },
     addWorkshopListDetail(formName) {
       this.$refs[formName].validate((valid) => {
@@ -931,7 +935,7 @@ export default {
           } else if (this.form3.OutNumber === '' || this.form3.OutNumber > this.enableOut) {
             this.$message.error('请正确输入领用数量')
           } else {
-            addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form3.OutNumber, this.partType, this.form3.outNote, this.craftplannumber, this.receive, this.teamPart, this.purchaseDetailNum, this.locatenumber, 1, this.materialLocate).then(response => {
+            addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.form3.OutNumber, this.partType, this.form3.outNote, this.craftplannumber, this.receive, this.purchaseDetailNum, this.askPurchaseNumber, this.locatenumber, this.outType, this.materialLocate, this.materialName, this.materialType, this.materialNumber, this.partPiant, this.material).then(response => {
               if (response.data[0].result === '1') {
                 this.$message.success('增加成功')
                 this.searchPartinfo()

src/views/Inventory/SubPartCome/index.vue

@@ -50,6 +50,16 @@
             {{ scope.row.备注 }}
           </template>
         </el-table-column>
+        <el-table-column label="仓库" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.仓库名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="货位" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.货位名称 }}
+          </template>
+        </el-table-column>
         <el-table-column label="操作" align="center" min-width="120">
           <template slot-scope="scope" align="center">
             <el-button size="small" type="primary" icon="el-icon-back" style="margin: 0 0 0 0px" @click="substitutePart(scope.row)">替换件到货</el-button>

src/views/Inventory/SubstitutePart/index.vue

@@ -184,13 +184,14 @@
       <!--选择替换件-->
       <el-dialog :visible.sync="dialogFormVisible2" title="新增替换件" center width="600px">
         <el-form :rules="rules" label-position="left">
-          <el-form-item label="物料名称" prop="ContractNumberValue" label-width="150px" size="small">
+          <el-form-item label="物料名称" prop="ContractNumberValue" label-width="150px" size="mini">
-            <el-input v-model="form.ExchangeNumber" size="small" placeholder="物料名称" style="width: 200px"/>
+            <el-input v-model="materialName" size="small" placeholder="物料名称" style="width: 200px"/>
-            <el-button type="primary" @click="getSubstituted()">查询</el-button>
+            <el-button type="primary" size = "mini" @click="getSubstituted()">查询</el-button>
           </el-form-item>
           <el-table
             :data="tableDataSub"
             border
+            size = "mini"
             style="width: 100%;"
             height="100">
             <el-table-column
@@ -208,21 +209,21 @@
                 {{ scope.row.物料型号 }}
               </template>
             </el-table-column>
-            <el-table-column label="数量" align="center" min-width="80">
+            <el-table-column label="货位存量" align="center" min-width="80">
               <template slot-scope="scope">
-                {{ scope.row.数量 }}
+                {{ scope.row.货位存量 }}
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" min-width="120">
               <template slot-scope="scope" align="center">
-                <el-button size="small" type="primary" icon="el-icon-sort-down" style="margin: 0 0 0 0px" @click="selected(scope.row)">选择</el-button>
+                <el-button size="mini" type="primary" icon="el-icon-sort-down" style="margin: 0 0 0 0px" @click="selected(scope.row)">选择</el-button>
               </template>
             </el-table-column>
           </el-table>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button @click="callOff('form')">取消</el-button>
+          <el-button size = "mini" @click="callOff('form')">取消</el-button>
-          <el-button type="primary" @click="chooseSub()">确 定</el-button>
+          <el-button size = "mini" type="primary" @click="chooseSub()">确 定</el-button>
         </div>
       </el-dialog>
     </el-card>
@@ -276,8 +277,8 @@
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="120">
           <template slot-scope="scope" align="center">
-            <el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 0px" @click="handleEdit(scope.row)">编辑</el-button>
+            <el-button size="mini" type="primary" icon="el-icon-edit" style="margin: 0 0 0 0px" @click="handleEdit(scope.row)">编辑</el-button>
-            <el-button size="small" type="danger" icon="el-icon-delete" style="margin: 0 0 0 0px" @click="dropListinfor(scope.row)">删除</el-button>
+            <el-button size="mini" type="danger" icon="el-icon-delete" style="margin: 0 0 0 0px" @click="dropListinfor(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -331,7 +332,9 @@ export default {
       listLoading: '',
       listLoading1: '',
       substituteListNumber: '',
-      title: ''
+      title: '',
+      materialName: '',
+      materialName_check: 0
     }
   },
   computed: {
@@ -416,7 +419,12 @@ export default {
     },
     // 被替换件查询
     getSubstituted() {
-      searchSubstituted().then(response => {
+      if (this.materialName === '') {
+        this.materialName_check = 0
+      } else {
+        this.materialName_check = 1
+      }
+      searchSubstituted(this.materialName_check, this.materialName).then(response => {
         this.tableDataSub = response.data
       })
     },
@@ -443,9 +451,9 @@ export default {
     chooseSub() {
       this.dialogFormVisible2 = false
     },
-    // 增加交换件
+    // 增加替换件
     addListDetailinfor() {
-      addSubstitutepart(this.tableData2[0].离线合同明细流水号, this.tableData1[0].采购合同明细流水号, this.form.ExchangeNumber, this.tableData1[0].物料名称, this.tableData2[0].物料名称, this.picikingPeople, this.form.ExchangeNumberx, this.form.ExchangeNote).then(response => {
+      addSubstitutepart(this.tableData2[0].离线合同明细流水号, this.tableData1[0].采购合同明细流水号, this.form.ExchangeNumber, this.tableData1[0].物料名称, this.tableData2[0].货位流水号, this.tableData2[0].物料名称, this.picikingPeople, this.form.ExchangeNumberx, this.form.ExchangeNote).then(response => {
         if (response.data[0].result === '1') {
           this.$message.success('增加成功')
         } else { this.$message.error('增加失败') }

src/views/ManufacturingCenter/QuotaFormulation/index.vue

@@ -253,7 +253,7 @@ export default {
       this.listLoading = true
       this.tableData = []
       this.num0 = ''
-      if (this.radio === 1) {
+      if (this.radio === 1) { // 未编制
         detailInfo(this.partNumValue).then(response => {
           if (response.data.length !== 0) {
             this.typeValue = response.data[0].零件类型名称
@@ -264,6 +264,7 @@ export default {
           }
         }).then(() => {
           mainTable(this.num0).then(response => {
+            console.log(response.data)
             if (response.data.length === 0) {
               this.listLoading = false
             } else {

src/views/Outsourcing/OutsourcingDataMaintenance/index.vue

@@ -98,7 +98,7 @@
       </div>
     </el-card>
 
-    <el-dialog :visible.sync="dialogFormVisible1" title="外协价格计算系数维护" center width="20%">
+    <el-dialog :visible.sync="dialogFormVisible1" title="外协价格计算系数维护" center width="400px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left" class="demo-ruleForm" label-width="100px" style="width: 90%;margin: auto">
         <el-row style="margin: 2px 0 30px 30px;">
           <el-radio-group v-model="radio">

src/views/PurchasingCenter/PurchaseContractApproval/index.vue

@@ -197,6 +197,7 @@ export default {
   },
   methods: {
     fetchData() {
+      this.person = []
       initBuyer().then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.person.push({
@@ -206,6 +207,7 @@ export default {
           })
         }
       })
+      this.contractNum = []
       initContract().then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.contractNum.push({
@@ -244,7 +246,12 @@ export default {
             if (response.data[0].result === '1') {
               this.$message.success('审批成功')
               this.dialogVisible3 = false
+              this.fetchData() // 重新初始化
+              this.contractNumValue = ''
+              this.personValue = ''
+              this.supplierName = ''
               this.searchTable1()
+              this.returns = ''
             } else { this.$message.error('审批失败') }
           })
         } else {

src/views/PurchasingCenter/PurchaseContractSearch/index.vue

@@ -102,17 +102,22 @@
             <el-tag v-if="scope.row.审批情况内容==='不通过审批'" type="danger" size="small">未通过</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="采购合同号" align="center" min-width="130">
+        <el-table-column label="审批时间" align="center" min-width="140">
+          <template slot-scope="scope">
+            {{ scope.row.审批时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="采购合同号" align="center" min-width="160">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购合同名称" align="center" min-width="130">
+        <el-table-column label="采购合同名称" align="center" min-width="150">
           <template slot-scope="scope">
             {{ scope.row.采购合同名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="供应商" align="center" min-width="200">
+        <el-table-column label="供应商" align="center" min-width="220">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>

src/views/PurchasingCenter/PurchaseInvoiceDelivery/index.vue

@@ -9,17 +9,6 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <!--<span>采购合同号:</span>-->
-      <!--<el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable>-->
-      <!--<el-option-->
-      <!--v-for="item in contractNums"-->
-      <!--:key="item.value"-->
-      <!--:label="item.label"-->
-      <!--:value="item.value">-->
-      <!--<div style="float: left">{{ item.label }}</div>-->
-      <!--<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>-->
-      <!--</el-option>-->
-      <!--</el-select>-->
       <el-button
         type="success"
         size="small"
@@ -36,34 +25,29 @@
     </el-card>
 
     <el-card>
-      <el-table v-loading="" :data="tableData1" show-summary size="mini" style="max-height: 400px" height="400px" stripe border highlight-current-row @row-click="searchPic">
+      <el-table id="expandTable" :data="tableData1" show-summary size="mini" style="max-height: 400px" height="400px" stripe border @row-click="searchPicInner">
         <el-table-column type="expand">
           <template slot-scope="scope">
             <el-form id="table" label-position="left" inline class="demo-table-expand">
               <el-row>
-                <el-col :span="8">
+                <el-col :span="10">
+                  <viewer>
+                    <img :src="scope.row.scanSrc" alt="发票扫描件" height="200px">
+                  </viewer>
+                </el-col>
+                <el-col :span="14">
                   <el-form-item label="接收人">
                     {{ scope.row.接收人 ? scope.row.接收人 : '—' }}
-                  </el-form-item>
+                  </el-form-item><br>
-                </el-col>
-                <el-col :span="8">
                   <el-form-item label="接收时间">
                     {{ scope.row.接收时间 ? scope.row.接收时间 : '—' }}
-                  </el-form-item>
+                  </el-form-item><br>
-                </el-col>
-                <el-col :span="8">
                   <el-form-item label="发票号">
                     {{ scope.row.发票号 ? scope.row.发票号 : '—' }}
-                  </el-form-item>
+                  </el-form-item><br>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="8">
                   <el-form-item label="开户行">
                     {{ scope.row.开户行 ? scope.row.开户行 : '—' }}
-                  </el-form-item>
+                  </el-form-item><br>
-                </el-col>
-                <el-col :span="8">
                   <el-form-item label="开票时间">
                     {{ scope.row.开票时间 ? scope.row.开票时间.split(' ')[0] : '—' }}
                   </el-form-item>
@@ -83,7 +67,7 @@
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="关联合同" min-width="80px">
+        <el-table-column align="center" label="相关合同" min-width="80px">
           <template slot-scope="scope">
             <el-popover placement="right" width="400" trigger="click">
               <el-table :data="tableData01" stripe size="mini" show-summary>
@@ -104,15 +88,10 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <el-button slot="reference" plain type="success" size="mini" icon="el-icon-search" @click="invoiceDetail(scope.row)"/>
+              <el-button slot="reference" plain type="success" size="mini" icon="el-icon-document" @click="invoiceDetail(scope.row)"/>
             </el-popover>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="备注" min-width="150px">
-          <template slot-scope="scope">
-            {{ scope.row.备注 ? scope.row.备注 : '—' }}
-          </template>
-        </el-table-column>
         <el-table-column align="center" label="开票金额" min-width="100px" prop="开票金额">
           <template slot-scope="scope">
             {{ scope.row.开票金额 }}
@@ -128,6 +107,11 @@
             {{ scope.row.传送时间 }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="备注" min-width="150px">
+          <template slot-scope="scope">
+            {{ scope.row.备注 ? scope.row.备注 : '—' }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="操作" fixed="right" width="200px">
           <template slot-scope="scope">
             <el-button
@@ -156,7 +140,6 @@
           @size-change="handleSizeChange1"
           @current-change="handleCurrentChange1"/>
       </div>
-      <img :src="scanSrc" alt="发票扫描件" width="100%">
     </el-card>
 
     <el-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="460px">
@@ -208,7 +191,8 @@
           <el-form-item label="备注">
             <el-input v-model="form1.remark" size="small" placeholder="备注"/>
           </el-form-item>
-          <el-form-item label="发票扫描件">
+          <b style="color: #f56c6c;margin: 0">* </b>
+          <el-form-item label="发票扫描件" style="display: inline-block">
             <el-upload
               id="invoiceScan"
               ref="upload"
@@ -233,17 +217,18 @@
     <el-dialog :title="title1" :visible.sync="dialogVisible2" center style="min-height: 300px" width="1200px">
       <el-form ref="form1" :model="form1" :rules="rules1" label-position="right" label-width="80px">
         <el-row>
+          <el-col style="width: 800px">
+            <viewer>
+              <img :src="scanSrc" style="margin: 0 auto" alt="发票扫描件" width="800px">
+            </viewer>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="供应商">
               <el-input v-model="form1.supplierName" size="small" disabled placeholder="供应商"/>
             </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="开票金额">
               <el-input v-model="form1.money" size="small" disabled placeholder="开票金额"/>
             </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="传送人">
               <el-select v-model="form1.sendPersonValue" placeholder="传送人" size="small" disabled>
                 <el-option
@@ -253,8 +238,6 @@
                   :value="item.value"/>
               </el-select>
             </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="接收人">
               <el-select v-model="form1.receivePersonValue" placeholder="接收人" size="small" disabled>
                 <el-option
@@ -264,25 +247,15 @@
                   :value="item.value"/>
               </el-select>
             </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="6">
             <el-form-item label="备注">
               <el-input v-model="form1.remark" size="small" disabled placeholder="备注"/>
             </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="发票号" prop="invoiceNum">
               <el-input v-model="form1.invoiceNum" size="small" placeholder="发票号"/>
             </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="开户行" prop="bank">
               <el-input v-model="form1.bank" size="small" placeholder="开户行"/>
             </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="开票时间" prop="invoiceTime">
               <el-date-picker
                 v-model="form1.invoiceTime"
@@ -294,11 +267,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-form-item label="扫描件">
-            <img :src="scanSrc" alt="发票扫描件" width="1000px">
-          </el-form-item>
-        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
@@ -320,7 +288,7 @@ export default {
     return {
       offline: '非离线',
       check1: 0,
-      office: false,
+      office: null, // 是否为办公室
       scanSrc: '',
       upload: uploadInvoiceScan,
       limit: 1,
@@ -374,12 +342,15 @@ export default {
       'sidebar',
       'avatar',
       'name',
+      'token', // 角色编号
       'id' // 人员编号
     ])
   },
   created() {
     this.fetchData()
     this.searchTable1()
+    console.log(this.token)
+    Number(this.token) === 8 ? this.office = true : this.office = false // 是否为办公室，8是办公室，2是采购部
   },
   methods: {
     offlineChange2() { // 切换离线非离线(内)
@@ -457,6 +428,13 @@ export default {
       this.contractNumValue ? this.check2 = 1 : this.check2 = 0
       searchInvoice(this.pageCurrent1, this.pageSize1, this.check1, this.supplierNumValue, this.check2, this.contractNumValue).then(response => {
         this.tableData1 = response.data.rows
+        this.tableData1.map(v => {
+          this.$set(v, 'scanSrc', '')
+          return v
+        })
+        for (let i = 0; i < response.data.rows.length; i++) {
+          this.tableData1[i].scanSrc = this.searchPic(response.data.rows[i], i)
+        }
         this.total1 = response.data.total
       })
       this.scanSrc = ''
@@ -570,7 +548,18 @@ export default {
         })
       })
     },
-    async searchPic(row) {
+    async searchPic(row, i) {
+      const { data } = await request({
+        url: '',
+        method: 'post',
+        data: {
+          type: '3',
+          name: `select * from 采购管理_采购发票_附件 where 是否启用 = 1 and 发票交接流水号 = ${row.发票交接流水号}`
+        }
+      })
+      this.tableData1[i].scanSrc = 'http://localhost:8411/webpage/file/' + data[0].文件标识 + '.' + data[0].文件后缀
+    },
+    async searchPicInner(row) {
       const { data } = await request({
         url: '',
         method: 'post',
@@ -586,6 +575,9 @@ export default {
 </script>
 
 <style scoped>
+  #expandTable .el-form-item{
+    margin: 0;
+  }
   .el-tag{
     margin: 0
   }
@@ -601,9 +593,6 @@ export default {
   .el-input{
     width:200px
   }
-  span{
-    margin: 10px 0 10px 10px;
-  }
   .searchForm .el-form-item{
     margin-top: 1px;
     margin-bottom: 1px;