铅封号

src/api/common.js

@@ -409,3 +409,12 @@ export function getPartsListSGList(data) {
     data
   })
 }
+
+// 导出验收单
+export function getDownList(data) {
+  return request({
+    url: '/authdata/GetDataByName',
+    method: 'post',
+    data
+  })
+}

src/views/custom/purchase/index.vue

@@ -1020,12 +1020,18 @@
                 <span v-else-if="scope.row.purchase_type == 4">奶厅申购</span>
                 <span v-else>新增申购</span>
               </template>
+            </el-table-column>
+              <el-table-column label="申购牧场" min-width="110px" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.chiIdPastureName }}</span>
+              </template>
             </el-table-column>
             <el-table-column label="申购部门" min-width="110px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.departmentName }}</span>
               </template>
             </el-table-column>
+
             <el-table-column label="采购人" min-width="110px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.empname }}</span>
@@ -2434,7 +2440,8 @@ export default {
                   'srcpath': i.srcpath,
                   'picpath': i.picpath,
                   'departmentName': i.departmentName,
-                  'isParity': y
+                  'isParity': y,
+                  'chiIdPastureId': i.chiIdPastureId
                 })
               }
             })
@@ -2499,7 +2506,7 @@ export default {
     confirmationSheet() {
       console.log('点击立确认配单')
       this.temp1.matchCode = ''
-      console.log(this.list1) // table表格数据
+      console.log(this.list1,'0000000') // table表格数据
       // -------------------------------------------
       function groupBy1(array, f) {
         var groups1 = {}
@@ -2602,7 +2609,8 @@ export default {
             providerId: ai.providerId,
             providerName: ai.providerName,
             purpose: ai.purpose,
-            list: [ai]
+            list: [ai],
+            chiIdPastureId: ai.chiIdPastureId
           })
           providerNameMap[ai.providerName] = ai
           providerNameMap[ai.providerId] = ai
@@ -2658,7 +2666,7 @@ export default {
         })
         this.$forceUpdate()
       })
-      console.log(OrderNumberArray)
+      console.log(OrderNumberArray,'OrderNumberArray====')
       this.listConfirmationSheet = providerNameDest
       // console.log(JSON.stringify(this.listConfirmationSheet))
       console.log('根据供应商分类表格listConfirmationSheet', this.listConfirmationSheet)
@@ -2736,7 +2744,8 @@ export default {
               sumAmount: '@insertSpotList.sumAmount',
               contractId: '@insertSpotList.id',
               departmentName: '@insertSpotList.departmentName',
-              remark: '@insertSpotList.purpose'
+              remark: '@insertSpotList.purpose',
+              chiIdPastureId: '@insertSpotList.chiIdPastureId'
             }}
             a = a + 1
           })

src/views/maintenance/repair/index.vue

@@ -336,7 +336,16 @@
                 <span  >
                   <el-input v-model="scope.row.contractCode" style="margin-top:10px" />
                 </span>
-
+              </template>
+            </el-table-column>
+             <el-table-column :key="9" label="铅封号" prop="sealNumber" align="center" min-width="80px">
+              <template slot-scope="scope">
+                   <el-input v-model="scope.row.sealNumber" style="margin-top:10px" />
+              </template>
+            </el-table-column>
+            <el-table-column  :key="10"  label="历史铅封号" prop="sealNumberHis" align="center" min-width="80px">
+              <template slot-scope="scope">
+                <span >{{ scope.row.sealNumberHis }}</span>
               </template>
             </el-table-column>
             <el-table-column :key="7" label="备注" prop="remark" align="center" min-width="80px">

src/views/maintenance/subcontractingMainten/tabPage/tab1.vue

@@ -308,7 +308,7 @@
                 <span v-if="dialogStatus ==='see'">{{ scope.row.contractCode }}</span>
               </template>
             </el-table-column>
-            <el-table-column :key="9"  label="铅封号" prop="sealNumber" align="center" min-width="80px">
+            <el-table-column   :key="9"  label="铅封号" prop="sealNumber" align="center" min-width="80px">
               <template slot-scope="scope">
                 <span v-if="dialogStatus ==='create'||dialogStatus ==='update'">
                   <el-input v-model="scope.row.sealNumber" style="margin-top:10px" />
@@ -316,15 +316,11 @@
                 <span v-if="dialogStatus ==='see'">{{ scope.row.sealNumber }}</span>
               </template>
             </el-table-column>
-            <el-table-column :key="9"  label="历史铅封号" prop="sealNumberHis" align="center" min-width="80px">
+            <el-table-column :key="10"  label="历史铅封号" prop="sealNumberHis" align="center" min-width="80px">
               <template slot-scope="scope">
-                <span v-if="dialogStatus ==='create'||dialogStatus ==='update'">
-                  <el-input v-model="scope.row.sealNumberHis" style="margin-top:10px" />
-                </span>
-                <span v-if="dialogStatus ==='see'">{{ scope.row.sealNumberHis }}</span>
+                <span>{{ scope.row.sealNumberHis }}</span>
               </template>
             </el-table-column>
-
             <el-table-column :key="8" label="备注" prop="remark" align="center" min-width="180px">
               <template slot-scope="scope">
                 <span v-if="dialogStatus ==='create'||dialogStatus ==='update'">

src/views/maintenance/subcontractingMainten/tabPage/tab2.vue

@@ -264,6 +264,11 @@
                 <span v-if="dialogStatus ==='see'">{{ scope.row.sealNumber }}</span>
               </template>
             </el-table-column>
+            <el-table-column :key="10"  label="历史铅封号" prop="sealNumberHis" align="center" min-width="80px">
+              <template slot-scope="scope">
+                <span>{{ scope.row.sealNumberHis }}</span>
+              </template>
+            </el-table-column>
             <el-table-column   :render-header="addRedStar"  label="质保日期" prop="warrantydate" align="center" min-width="80px">
               <template slot-scope="scope">
                 <span v-if="dialogStatus ==='create'||dialogStatus ==='update'">
@@ -733,7 +738,7 @@
 <script>
 import echarts from 'echarts'
 require('echarts/theme/macarons')
-import { GetDataByNames, GetReportform, GetDataByName, PostDataByName, checkButtons,GetAccount, ExecDataByConfig} from '@/api/common'
+import { GetDataByNames, GetReportform, GetDataByName, PostDataByName, checkButtons,GetAccount, getDownList,ExecDataByConfig} from '@/api/common'
 import Cookies from 'js-cookie'
 import { parseTime, json2excel,sortChange } from '@/utils/index.js'
 import { MessageBox } from 'element-ui'
@@ -1002,7 +1007,7 @@ export default {
         this.percentage = this.percentage
       }, 1000)
       this.downLoadParm = {}
-      this.downLoadParm.name = 'loadRepirsList'
+      this.downLoadParm.name = 'getBigacceptanceExcelList'
       this.downLoadParm.offset = 0
       this.downLoadParm.page = 1
       this.downLoadParm.returntype = 'Map'
@@ -1014,10 +1019,11 @@ export default {
        this.tableObj1.getdataListParm.parammaps.stopTime = ''
       }
       this.downLoadParm.parammaps =this.tableObj1.getdataListParm.parammaps
-      GetAccount(this.downLoadParm).then(response => {
+      getDownList(this.downLoadParm).then(response => {
         console.log('导出', response)
            if(response.data.list !== null && response.data.list !== ''){
           for(let i=0;i<response.data.list.length;i++){
+                  //  <span v-if="scope.row.iscontract == 0 ">有</span>
             if(response.data.list[i].status == 0){
               this.$set(response.data.list[i],'status','未离厂')
             }else if(response.data.list[i].status == 1){
@@ -1026,10 +1032,16 @@ export default {
               this.$set(response.data.list[i],'status','已回厂')
             }
 
-            if (response.data.list[i].reject == 0) {
-              this.$set(response.data.list[i],'reject','正常')
+            if (response.data.list[i].iscontract == 0) {
+              this.$set(response.data.list[i],'iscontract','有合同')
+            } else {
+              this.$set(response.data.list[i],'iscontract','无合同')
+            }
+
+            if (response.data.list[i].amountStauts == 0) {
+              this.$set(response.data.list[i],'amountStauts','未领用')
             } else {
-              this.$set(response.data.list[i],'reject','已关单')
+              this.$set(response.data.list[i],'amountStauts','已领用')
             }
           }
         }else{
@@ -1045,8 +1057,12 @@ export default {
         }
           const elecExcelDatas = [
           {
-            tHeader: ['委外验收单号', '牧场', '部门', '申请人', '有无合同', '审核状态', '离厂日期','回厂日期','供应商','设备名称','设备内部编号','费用类型','铅封号','历史铅封号','质保日期','领用单号','领用部门','领用日期','领用状态','备件编号','备件名称','备件规格','领用数量'],
-            filterVal: ['acceptanceCode', 'pastureName', 'departmentName', 'applicantName', 'isContract', 'reviewStatus', 'details','departureDate','returnDate','supplier','equipmentName','equipmentInternalCode','costType','sealNumber','historicalSealNumber','warrantyDate','applicationNumber','applicationDepartment','applicationDate','applicationStatus','','','','',],
+              tHeader: ['委外验收单号', '牧场', '部门', '申请人', '有无合同', '审核状态', '离厂日期', '回厂日期',
+                '供应商', '设备名称', '设备内部编号', '费用类型', '铅封号', '历史铅封号', '质保日期', '领用单号', '领用部门', '领用日期', '领用状态',
+                '备件编号', '备件名称', '备件规格', '领用数量'],
+              filterVal: ['acceptanceCode', 'pastureName', 'departmentName', 'applicantName', 'iscontract', 'status', 'lcdate', 'hcdate',
+                'providerName', 'eqName', 'eqCode', 'typea', 'sealNumber', 'sealNumberHis', 'warrantydate', 'applyCode', 'bpDepartment', 'applyDate', 'amountStauts',
+                'partCode', 'partName', 'specification', 'amount'],
             tableDatas: this.downLoadList,
             sheetName: '验收委外维修'
           }