Browse Source

Merge branch 'feature/merge1129' of Epans/modernDairy into master

duanxiaoduan 1 year ago
parent
commit
9fe8918045

+ 2 - 2
.env.development

@@ -6,9 +6,9 @@ ENV = 'development'
 # 线上正式地址
 #  VUE_APP_BASE_API = 'http://eam.modernfarming.cn:8000/'
 # 白少后台本地
-# VUE_APP_BASE_API = 'http://192.168.1.77:8082/'
+VUE_APP_BASE_API = 'http://192.168.1.77:8082/'
 # 线上测试
-VUE_APP_BASE_API = 'http://tmrwatch.cn:8082/'
+# VUE_APP_BASE_API = 'http://tmrwatch.cn:8082/'
 # VUE_APP_BASE_API = 'http://tmrwatch.cn:8082/'
 # VUE_APP_BASE_API = 'http://127.0.0.1:8082/'
 

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


+ 23 - 1
src/views/asset/basics/index.vue

@@ -83,7 +83,29 @@
             </el-table-column>
             <el-table-column label="牧场" align="center" prop="pastureName" />
             <el-table-column label="设备类别" align="center" prop="eqClassName" />
-            <el-table-column label="设备名称" align="center" prop="eqName" />
+            <el-table-column align="center" prop="eqName" width="120">
+              <template slot="header" slot-scope="scope">
+                <div>
+                  设备名称
+                  <!-- <el-popover placement="top" width="200" trigger="click">
+                    <p>多行信息多行信息多行信息<br/>第二行信息</p>
+                    <i class="el-icon-question" slot="reference"></i>
+                  </el-popover> -->
+                  <!-- <el-tooltip placement="top" trigger="click">
+                    <div slot="content">多行信息多行信息多行信息<br/>第二 行信息</div>
+                    <i class="el-icon-question"></i>
+                  </el-tooltip> -->
+                </div>
+              </template>
+              <template slot-scope="{row}">
+                <div v-if="row.exceed == 1">
+                  <div style="background:#EC808D;display:block;line-height: 50px;">{{ row.eqName }}</div>
+                </div>
+                <div v-else>
+                  <div style="display:block;line-height: 50px;">{{ row.eqName }}</div>
+                </div>
+              </template>
+            </el-table-column> 
             <el-table-column label="设备内部编号" align="center" prop="eqCode" />
            <el-table-column label="财务编号" align="center" prop="financeCode" />
             <el-table-column label="规格" align="center" prop="specification" />

+ 39 - 1
src/views/custom/contractManagement/index.vue

@@ -98,6 +98,7 @@
             <el-button v-if="tab1.contractManagement.isContractAdd && parseInt(tab1.detailsSpareParts.detailsList.pastureId) == parseInt(isGroupAdministrator) || parseInt(isEmployeid) == 0" class="filter-item" type="primary" icon="el-icon-edit" :disabled="tab1.detailsSpareParts.detailsList.statued=='终止' || tab1.detailsSpareParts.detailsList.statued=='已过期' || tab1.detailsSpareParts.detailsList.statued=='新增未通过'" @click="handleTab1Create2">新增</el-button>
             <el-button v-if="tab1.contractManagement.isContractChange && parseInt(tab1.detailsSpareParts.detailsList.pastureId) == parseInt(isGroupAdministrator) || parseInt(isEmployeid) == 0" class="filter-item" type="primary" icon="el-icon-edit" :disabled="tab1.detailsSpareParts.detailsList.statued=='终止' || tab1.detailsSpareParts.detailsList.statued=='已过期' || tab1.detailsSpareParts.detailsList.statued=='新增未通过'" @click="handleTab1Change2">变更</el-button>
             <el-button v-if="tab1.contractManagement.isContractExport" class="filter-item" type="primary" icon="el-icon-edit" @click="handleTab1Export2">导出</el-button>
+            <el-button v-if="tab1.contractManagement.isContractUplaod" class="filter-item" type="success" icon="el-icon-upload2" @click="sapUpload">SAP上传</el-button>
           </div>
           <el-table
             :key="tab1.detailsSpareParts.tableKey"
@@ -991,7 +992,7 @@
 
 <script>
 // 引入
-import { GetDataByName, GetDataByNames, checkButtons, ExecDataByConfig, UpdateDataRelation, PostDataByName, failproccess } from '@/api/common'
+import { GetDataByName, GetDataByNames, checkButtons, ExecDataByConfig, UpdateDataRelation, PostDataByName, failproccess,postJson } from '@/api/common'
 import waves from '@/directive/waves'
 import { parseTime, json2excel, sortChange } from '@/utils/index.js'
 import Pagination from '@/components/Pagination'
@@ -1055,6 +1056,7 @@ export default {
           radioAll: '全部',
           isContractAdd: [],
           isContractExport: [],
+          isContractUplaod: [],
           isContractSee: [],
           isContractChange: [],
           isDisabled: false,
@@ -1376,6 +1378,10 @@ export default {
       const ContractExport = 'customs:contract:export'
       const isContractExport = checkButtons(this.$store.state.user.buttons, ContractExport)
       this.tab1.contractManagement.isContractExport = isContractExport
+      // SAP上传
+      const ContractUplaod = 'customs:contract:sapupload'
+      const isContractUplaod = checkButtons(this.$store.state.user.buttons, ContractUplaod)
+      this.tab1.contractManagement.isContractUplaod = isContractUplaod
       // 变更
       const ContractChange = 'customs:contract:change'
       const isContractChange = checkButtons(this.$store.state.user.buttons, ContractChange)
@@ -2922,6 +2928,30 @@ export default {
           json2excel(ExcelDatas, '合同明细', true, 'xlsx')
         })
       })
+    },
+    sapUpload(){
+      if(this.selectList.length == 0){
+        this.$notify({ title: '失败', message: '请勾选数据!'  , type: 'error', duration: 2000 })
+        return false
+      }
+      let url = 'authdata/contract/push'
+      let ids = []
+      this.selectList.forEach((i)=>{
+        ids.push(i.id)
+        console.log(i,'===')
+      })
+      let data = {
+        pastureId:parseInt(Cookies.get('pastureid')),
+        providerId:this.tab1.detailsSpareParts.detailsList.providerId,
+        contractIdList:ids
+      }
+      postJson(url,data).then(response => {
+        if (response.msg !== 'fail') {
+          this.$notify({ title: '成功', message: '上传成功', type: 'success', duration: 2000 })
+        } else {
+          this.$notify({ title: '上传失败', message: response.data, type: 'warning', duration: 2000 })
+        }
+      })
     }
   }
 }
@@ -2930,4 +2960,12 @@ export default {
   /deep/ .el-badge__content.is-fixed{
     z-index: 1;
   }
+  .el-notification__content {
+    white-space: pre-line !important;
+  }
+</style>
+<style lang="scss">
+  .el-notification__content {
+      white-space: pre-line !important;
+    }
 </style>

+ 2 - 2
src/views/custom/custom/index.vue

@@ -1182,9 +1182,9 @@ export default {
             }
             // const list1 = this.downList
             const tHeader = [
-              '牧场', '备件名称', '备件编号', '规格', '供应商', '单位', '品牌', '单价', '当前库存', '在库天数','最小库存', '最大库存', '位置', '状态', '合同状态', '零库存']
+              '牧场', '备件名称', '备件编号', '规格', '供应商', '单位', '品牌', '单价', '当前库存', '在库天数','闲置备件','最小库存', '最大库存', '位置', '合同状态', '零库存']
             const filterVal = [
-              'pastureName', 'partName', 'partCode', 'specification', 'providerName', 'unit', 'brand', 'price', 'reportery', 'daysInStorage','minRepertory', 'maxRepertory', 'location', 'statue', 'isZeroStock']
+              'pastureName', 'partName', 'partCode', 'specification', 'providerName', 'unit', 'brand', 'price', 'reportery', 'daysInStorage','xzparts','minRepertory', 'maxRepertory', 'location', 'statue', 'isZeroStock']
             const data1 = this.formatJsonTemp(filterVal, list1)
 
             excel.export_json_to_excel({

+ 6 - 0
src/views/custom/outStock/index.vue

@@ -122,6 +122,7 @@
             <el-table-column   prop="sterilisation" label="冲销状态" min-width="80px" align="center">
               <template slot-scope="scope">
                 <span v-if="scope.row.sterilisation == 1">已冲销</span>
+                <span v-if="scope.row.sterilisation == 2">部分冲销</span>
                 <span v-else>未冲销</span>
               </template>
             </el-table-column>
@@ -3324,3 +3325,8 @@ export default {
   }
 
 </style>
+<style lang="scss">
+  .el-notification__content {
+      white-space: pre-line !important;
+    }
+</style>

+ 2 - 1
src/views/custom/returngoods/index.vue

@@ -533,9 +533,10 @@
               <span>{{ scope.row.sumPrice }}</span>
             </template>
           </el-table-column>
-          <el-table-column     prop="dflag" label="冲销状态" min-width="80px" align="center">
+          <el-table-column prop="dflag" label="冲销状态" min-width="80px" align="center">
               <template slot-scope="scope">
                 <span v-if="scope.row.dflag == 1">已冲销</span>
+                <span v-if="scope.row.dflag == 2">部分冲销</span>
                 <span v-else>未冲销</span>
               </template>
             </el-table-column>

+ 1 - 0
src/views/custom/storage/index.vue

@@ -108,6 +108,7 @@
             <el-table-column   prop="sterilisation" label="冲销状态" min-width="80px" align="center">
               <template slot-scope="scope">
                 <span v-if="scope.row.sterilisation == 1">已冲销</span>
+                <span v-if="scope.row.sterilisation == 2">部分冲销</span>
                 <span v-else>未冲销</span>
               </template>
             </el-table-column>

+ 9 - 9
src/views/custom/writeoff/index.vue

@@ -41,18 +41,18 @@
       </el-table-column>
       <el-table-column label="牧场" min-width="150px" align="center" prop="pastureName" />
       <el-table-column label="物料凭证号" min-width="150px" align="center" prop="materialCode" />
-      <el-table-column label="物料凭证年度" min-width="150px" align="center" prop="proofYear" />
+      <!-- <el-table-column label="物料凭证年度" min-width="150px" align="center" prop="proofYear" /> -->
       <el-table-column label="凭证中的过账信息" min-width="150px" align="center" prop="chargeDate" />
       <el-table-column label="设备管理平台单号" min-width="150px" align="center" prop="orderNumber" />
 
-      <el-table-column label="是否已开票" min-width="150px" align="center" show-overflow-tooltip v-if="table1.getdataListParm.parammaps.writeoffType == '备件入库' || table1.getdataListParm.parammaps.writeoffType == '备件退货'" >
-            <template slot-scope="scope">
-              <span v-if="scope.row.hasTicket == 1">是</span>
-              <span v-if="scope.row.hasTicket == 0">否</span>
-              <span v-if="scope.row.hasTicket == ''"> </span>
-            </template>
-          </el-table-column>
-      <el-table-column label="设备管理平台行号" min-width="150px" align="center" prop="rowNumber" />
+      <!-- <el-table-column label="是否已开票" min-width="150px" align="center" show-overflow-tooltip v-if="table1.getdataListParm.parammaps.writeoffType == '备件入库' || table1.getdataListParm.parammaps.writeoffType == '备件退货'" >
+        <template slot-scope="scope">
+          <span v-if="scope.row.hasTicket == 1">是</span>
+          <span v-if="scope.row.hasTicket == 0">否</span>
+          <span v-if="scope.row.hasTicket == ''"> </span>
+        </template>
+      </el-table-column> -->
+      <!-- <el-table-column label="设备管理平台行号" min-width="150px" align="center" prop="rowNumber" /> -->
       <el-table-column label="状态" min-width="150px" align="center" prop="status" />
       <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">

+ 10 - 1
src/views/report/inventorySummary/index.vue

@@ -5,7 +5,10 @@
       <el-progress style="padding-left: 10px;" :text-inside="true" :stroke-width="26" :percentage="percentage" />
     </div>
     <div class="filter-container">
-      <el-date-picker v-model="monthDate" type="monthrange" range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份"  @change="changeTime" />
+      <el-date-picker v-model="monthDate" type="monthrange" :clearable="false" range-separator="至" start-placeholder="开始月份" class="filter-item" end-placeholder="结束月份"  @change="changeTime" />
+      <el-select v-model="isZeroStock" placeholder="是否零库存" class="filter-item" style="width: 120px;" @change="changeIsZeroStock">
+        <el-option v-for="item in isZeroStockList" :key="item.id" :label="item.name" :value="item.id" />
+      </el-select>
       <el-button class="filter-item" type="success" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
     </div>
     <div v-if="isTable1" class="table">
@@ -115,6 +118,8 @@ export default {
   data() {
     return {
       monthDate:[parseTime(new Date(), '{y}-{m}'), parseTime(new Date(), '{y}-{m}')],
+      isZeroStock:0,
+      isZeroStockList:[{id:0,'name':'非零库存'},{id:1,'name':'零库存'}],
       rowStyle: { maxHeight: 50 + 'px', height: 45 + 'px' },
       cellStyle: { padding: 0 + 'px' },
       types: [{ id: 0, name: '按供应商' }, { id: 1, name: '按备件类别' }],
@@ -208,6 +213,9 @@ export default {
       }
       this.get_table_data()
     },
+    changeIsZeroStock(item){
+      this.get_table_data()
+    },
     get_table_data() {
       this.listLoading = true
       if (Cookies.get('pastureid') == 18) {
@@ -217,6 +225,7 @@ export default {
       }
       this.getdataListParm.parammaps.startDate = this.monthDate[0]
       this.getdataListParm.parammaps.endDate = this.monthDate[1]
+      this.getdataListParm.parammaps.isZeroStock = this.isZeroStock
       GetDataByName(this.getdataListParm).then(response => {
         if (response.data.list !== null) {
           console.log('table数据', response.data.list)

Some files were not shown because too many files changed in this diff