Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

public/static/payprint3.html

@@ -570,7 +570,7 @@
                             </div>
                             <!-- <img :src="customerList1[index].imgURl.imageUrl3" class="avatar" /> -->
                             <img v-if="printData1[index].imgURl" :src="printData1[index].imgURl.imageUrl3" class="avatar" />
-                            <img v-else class="avatar" />
+                            <!-- <img v-else class="avatar" /> -->
                             <!-- <img v-if="printData1[index].imgURl" :src="printData1[index].imgURl.imageUrl4" class="avatar" />
                             <img v-else class="avatar" /> -->
 

src/api/V2/houseSelfCollect/index.js

@@ -122,4 +122,8 @@ export const API_GET_CONTRACT ='/contractManagementInfo/getInContract'
 export const API_SPONSOR_WITHDRAW ='/newWorkflow/api/stopInstance'
 // 获取仓库id
 export const API_GET_BASEID ='/qualityInspectionManagement/selectBaseId'
+// 换任务号
+export const API_POST_TASK_NO = `/weighingManagement/api/changeTaskNo`
+// 丹东港生成入库单
+export const API_POST_DANDONG_ORDER = `/paymentManagement/api/generateOrder`
 

src/api/V2/outboundManagement/index.js

@@ -51,4 +51,6 @@ export const API_GAT_INFO = '/commonSysParameter/getInfo'
 // 是否创建运输任务
 export const API_GET_TRANTASK ='/inOutWarehouseTask/tranTaskCount'
 // 查询合同
-export const API_GET_CONTRACT ='/contractManagementInfo/getOutContract'
+export const API_GET_CONTRACT ='/contractManagementInfo/getOutContract'
+// 换任务号
+export const API_POST_TASK_NO = `/weighingManagement/api/changeTaskNo`

src/api/V2/profitable/index.js

@@ -109,4 +109,6 @@ export const API_GET_WAREHOUSINGORDER_LIST = '/warehousingOrder/selectInfo'
 //费用明细信息
 export const API_POST_EXPORTFILE = '/expenseInfo/exportPc'
 //费用编号
-export const API_GET_CONSTNO = '/expenseInfo/costNoList'
+export const API_GET_CONSTNO = '/expenseInfo/costNoList'
+// 导入
+export const API_IMPORT_FIXED ='/fixedAssetsInfo/api/importFixedAssets'

src/lang/zh.js

@@ -1102,6 +1102,7 @@ export default {
     warehouseprofits: '库点利润',
     expensemanagement: '费用管理',
     inOutDetailed: '收支明细',
+    fixedAssets:'固定资产',
 
     //出库管理
     outboundManagement: '出库管理',

src/model/houseSelfCollect/index.js

@@ -60,6 +60,8 @@ import {
   API_POST_RETURN,
   API_POST_SUBMIT,
   API_POST_CHANE_NO,
+  API_POST_TASK_NO,
+  API_POST_DANDONG_ORDER,
   API_POST_DELETE,
   API_GET_CONTRACT,
   API_SPONSOR_WITHDRAW,
@@ -191,3 +193,7 @@ export const getcontract = appRx.get(API_GET_CONTRACT, errorCatcher, errorHandle
 export const sponsorWithdraw = appRx.post(API_SPONSOR_WITHDRAW, errorCatcher, errorHandle, filter)
 // 获取仓库id
 export const getBaseId = appRx.get(API_GET_BASEID, errorCatcher, errorHandle, filter)
+// 换任务号
+export const changeTaskNo = appRx.post(API_POST_TASK_NO, errorCatcher, errorHandle, filter)
+// 丹东港生成入库单
+export const dandongOrder = appRx.post(API_POST_DANDONG_ORDER, errorCatcher, errorHandle, filter)

src/model/outboundManagement/index.js

@@ -23,6 +23,7 @@ import {
     API_GET_INSPECT_CONTRANCLISTWEIGHING,
     API_POST_NEW_SUBMIT,
     API_POST_CHANE_NO,
+    API_POST_TASK_NO,
     API_POST_IMPORT_SALE,
     API_POST_IMPORT_YK,
     API_POST_GO_BACK,
@@ -85,4 +86,6 @@ export const getInfo = appRx.get(API_GAT_INFO, errorCatcher, errorHandle, filter
 // 是否创建运输任务
 export const gettask = appRx.get(API_GET_TRANTASK, errorCatcher, errorHandle, filter)
 // 获取合同
-export const getcontract = appRx.get(API_GET_CONTRACT, errorCatcher, errorHandle, filter)
+export const getcontract = appRx.get(API_GET_CONTRACT, errorCatcher, errorHandle, filter)
+// 换任务号
+export const changeTaskNo = appRx.post(API_POST_TASK_NO, errorCatcher, errorHandle, filter)

src/views/contractManagement/acquisitionContract.vue

@@ -201,11 +201,9 @@
             v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.delete`
             " @click="handleDelete(scope.row)" alt="" />
-            <div v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
+            <div v-show="scope.row.showFlag" v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
               <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px" src="../../../public/img/chehui.png"
-                @click="withdraw(scope.row)" v-hasPermission="
-                            `contractManagement.buyContract.buyContractInfo.edit`
-                          " alt="" />
+                @click="withdraw(scope.row)" v-hasPermission="`contractManagement.buyContract.buyContractInfo.edit`" alt="" />
             </div>
             <!-- <ws-button v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" type="primary" @click="withdraw(scope.row)" >撤回</ws-button> -->
         </template>
@@ -282,6 +280,7 @@
         showType: true,
         // 年
         year: '',
+        showFlag:false,
         deliver_type: 1,
         deptBudgetTotal: 0,
         currentPage: 1,
@@ -531,6 +530,7 @@
             goodsType: this.goodsType,
             currentPage: this.currentPage,
             pageSize: this.pageSize,
+            agreementType: '收购合同',
             searchType: this.searchType,
             searchKeyWord: this.searchKeyWord,
             startDate: this.startDate,
@@ -541,6 +541,9 @@
           .toPromise()
           .then((response) => {
             for (var i = 0; i < response.records.length; i++) {
+              if (response.records[i].creator == localStorage.getItem('ws-pf_staffName')) {
+                response.records[i].showFlag = true
+              }
               if(response.records[i].status){
                 response.records[i].currectstatus=response.records[i].status
               }

src/views/contractManagement/collectionContract.vue

@@ -144,7 +144,7 @@
             v-hasPermission="
                 `contractManagement.dsContract.dsContractInfo.list`
               " @click="handleRecord(scope.row)" alt="" />
-              <div v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
+              <div v-show="scope.row.showFlag" v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
                 <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px" src="../../../public/img/chehui.png"
                   @click="withdraw(scope.row)" v-hasPermission="`contractManagement.dsContract.dsContractInfo.edit`" alt="" />
               </div>
@@ -211,6 +211,7 @@
         // showType: true,
         // 年
         year: '',
+        showFlag:false,
         deliver_type: 1,
         deptBudgetTotal: 0,
         currentPage: 1,
@@ -219,7 +220,7 @@
         searchType: 1,
         searchTypeText: '未完成',
         searchKeyWord: '',
-        contractType: 1,
+        contractType: 3,
         goodsType: 1,
         startDate: null,
         endDate: null,
@@ -421,7 +422,9 @@
               if (response.records[i].completedQuantity) {
                 response.records[i].completedQuantity = response.records[i].completedQuantity.toFixed(3)
               }
-
+              if (response.records[i].creator == localStorage.getItem('ws-pf_staffName')) {
+                response.records[i].showFlag = true
+              }
               if (response.records[i].addressUrl != null) {
                 if (response.records[i].addressUrl) {
                   response.records[i].addressUrlArray =

src/views/contractManagement/purchaseContract.vue

@@ -215,7 +215,7 @@
             src="../../../public/img/shanchu.png" v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.delete`
             " @click="handleDelete(scope.row)" alt="" />
-                         <div v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
+                         <div v-show="scope.row.showFlag" v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
               <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px" src="../../../public/img/chehui.png"
                 @click="withdraw(scope.row)" v-hasPermission="
                             `contractManagement.buyContract.buyContractInfo.edit`
@@ -334,6 +334,7 @@ export default {
       goodsType: 1,
       startDate: null,
       endDate: null,
+      showFlag:false,
       addressUrls: [],
       accesscard: false,
       // 提交类型
@@ -692,6 +693,9 @@ export default {
             } else {
               response.records[i].addressUrlArray = []
             }
+            if (response.records[i].creator == localStorage.getItem('ws-pf_staffName')) {
+              response.records[i].showFlag = true
+              }
           }
           this.deptCircularPage.currentPage = response.current
           this.deptCircularPage.pageSize = response.size

src/views/contractManagement/salesContract.vue

@@ -219,14 +219,10 @@
             src="../../../public/img/shanchu.png" v-hasPermission="
               `contractManagement.salesContract.salesContractInfo.delete`
             " @click="handleDelete(scope.row)" alt="" />
-                        <div v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
-              <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px" src="../../../public/img/chehui.png"
-                @click="withdraw(scope.row)" v-hasPermission="
-                            `contractManagement.buyContract.buyContractInfo.edit`
-                          " alt="" />
+            <div v-show="scope.row.showFlag" v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
+                <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px" src="../../../public/img/chehui.png"
+                   @click="withdraw(scope.row)" v-hasPermission="`contractManagement.buyContract.buyContractInfo.edit`" alt="" />
             </div>
-            <!-- <ws-button v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" type="primary" @click="withdraw(scope.row)" >撤回</ws-button> -->
-            <!-- v-hasPermission="`contractManagement.salesContract.salesContractInfo.add`" -->
         </template>
       </el-table-column>
     </el-table>
@@ -353,7 +349,7 @@ export default {
       contractForm: {},
       categoryIndex: 0,
       rulesVendor: {},
-      size: 10,
+      showFlag:false,
       appendixIdss: [],
       compId: localStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
@@ -710,9 +706,9 @@ export default {
             } else {
               response.records[i].datestatus = false
             }
-
-
-
+            if (response.records[i].creator == localStorage.getItem('ws-pf_staffName')) {
+                response.records[i].showFlag = true
+              }
             if (response.records[i].completedQuantity) {
               response.records[i].completedQuantity = response.records[i].completedQuantity.toFixed(3)
             }

src/views/contractManagement/storageContract.vue

@@ -145,7 +145,7 @@
             v-hasPermission="
                 `contractManagement.dcContract.dcContractInfo.list`
               " @click="handleRecord(scope.row)" alt="" />
-              <div v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
+              <div v-show="scope.row.showFlag" v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
               <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px" src="../../../public/img/chehui.png"
                 @click="withdraw(scope.row)" v-hasPermission="
                             `contractManagement.dcContract.dcContractInfo.edit`
@@ -221,6 +221,7 @@
         endDate: null,
         addressUrls: [],
         deptCircularPage: {},
+        showFlag:false,
         date: {
           year: dayjs().format('YYYY'),
           month: dayjs().format('MM'),
@@ -404,6 +405,9 @@
           .toPromise()
           .then((response) => {
             for (var i = 0; i < response.records.length; i++) {
+              if (response.records[i].creator == localStorage.getItem('ws-pf_staffName')) {
+                response.records[i].showFlag = true
+              }
               if (response.records[i].completedQuantity) {
                 response.records[i].completedQuantity = response.records[i].completedQuantity.toFixed(3)
               }

src/views/home/right-top.vue

@@ -31,7 +31,7 @@ export default {
     };
   },
   watch:{
-    crklistData(res){
+    crklistData(res){debugger
       console.log('rightyop')
       console.log(res)
       this.pageflag = true;
@@ -49,12 +49,12 @@ export default {
       let numList =[]
       let numList2 =[]
       for(let i = 0;i<res.ck.length;i++){
-        if(i>ct) break
+        // if(i>ct) break
         dateList.push(res.ck[i].name)
         numList.push(Number(res.ck[i].count))
       }
       for(let i = 0;i<res.rk.length;i++){
-        if(i>ct) break
+        // if(i>ct) break
         numList2.push(Number(res.rk[i].count))
       }
        this.init(dateList, numList,numList2)

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -52,7 +52,7 @@
       <el-table-column label="操作" width="500">
         <template slot-scope="scope">
           <el-button size="mini" @click="newAcquisition(scope.$index, scope.row,'查看')">查看</el-button>
-          <el-button v-if="scope.row.approveStatus && scope.row.approveStatus !='发起人撤回'" size="mini" @click="withdraw(scope.row)">撤回</el-button>
+          <el-button v-show="scope.row.showFlag" v-if="scope.row.approveStatus && scope.row.approveStatus !='发起人撤回'" size="mini" @click="withdraw(scope.row)">撤回</el-button>
           <el-button v-if="scope.row.status!='审核中' || scope.row.approveStatus =='发起人撤回' " size="mini" @click="newAcquisition(scope.$index, scope.row,'编辑')"
             v-hasPermission=" `acquisitionManagement.acquisitionCustomer.edit`">编辑</el-button>
           <el-button v-if="scope.row.status=='审核中'" size="mini" :disabled="!scope.row.taskId"
@@ -97,6 +97,7 @@
         compId: '',
         accountName: '',
         tableData: [],
+        showFlag:false,
         selectVal: '',
         goodsNameList: [],
         warehouseList: [],
@@ -258,6 +259,9 @@
           .then(response => {
             for (let i = 0; i < response.records.length; i++) {
               this.goodsNameList.push(response.records[i].goodsName)
+              if(response.records[i].createUserId == localStorage.getItem('ws-pf_userId')){
+                response.records[i].showFlag = true
+              }
             }
             this.tableData = response.records
             this.deptBudgetTotal = response.total

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -549,6 +549,9 @@ export default {
         label: '黑龙江启兴粮食贸易有限公司'
       }],
       companyNameEWOptions: [{
+        value: '天津建源供应链管理有限公司',
+        label: '天津建源供应链管理有限公司'
+      },{
         value: '厦门建发物产有限公司',
         label: '厦门建发物产有限公司'
       }],

src/views/houseSelfCollect/paymentManagement.vue

@@ -74,6 +74,13 @@
           v-hasPermission="`acquisitionManagement.acquisitionPay.finace`">开票</ws-button>
         <ws-button type="primary" @click="exportlist" v-hasPermission="`acquisitionManagement.acquisitionPay.print`">导出
         </ws-button>
+         <ws-button type="primary" v-show='warehouseName=="丹东港"' @click="generateClick()">生成入库单</ws-button>
+          <el-upload style="margin-left: 8px;" class="upload-demo inline-block margin-right-10" action=""
+          :on-change="importClick" :show-file-list="false"
+          accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
+          :auto-upload="false">
+          <ws-button type="primary">导入</ws-button>
+        </el-upload>
         <!-- <ws-button type="primary" @click="handlepass" v-if="isShowAdopt">审核</ws-button> -->
         <!-- <ws-button type="primary" @click="payment" v-hasPermission="`acquisitionManagement.acquisitionPay.pay`">付款 -->
         <!-- </ws-button> -->
@@ -93,18 +100,13 @@
         <!-- <el-upload :on-change="importClick" action="" :show-file-list="false" accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel" :auto-upload="false"
           v-hasPermission="`acquisitionManagement.acquisitionPay.dow`"><el-button type="primary">导入</el-button>
         </el-upload> -->
-        <el-upload style="margin-left: 8px;" class="upload-demo inline-block margin-right-10" action=""
-          :on-change="importClick" :show-file-list="false"
-          accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-          :auto-upload="false">
-          <ws-button type="primary">导入</ws-button>
-        </el-upload>
         <el-link
           href="https://taohaoliang.oss-cn-beijing.aliyuncs.com/pcfiles/%E6%94%B6%E8%B4%AD%E4%BF%A1%E6%81%AF%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF%EF%BC%88%E6%96%B0%EF%BC%89.xlsx"
           style="margin-left: 8px"
         >
           <el-button type="primary">模板下载</el-button>
         </el-link>
+       
       </template>
       <template slot="right"></template>
     </BaseHeaderLayout>
@@ -437,7 +439,7 @@
     getpaymentexamine,
     getCustomerLook,
     paymentCommit,
-    getJurisdiction,
+    dandongOrder,
     invoicing,
     export1,
     settlementEdit,
@@ -1081,6 +1083,26 @@
         this.printType = 1
         this.isShowPrintType = true
       },
+      generateClick() {
+          this.$confirm(`确定生成入库单？`, {
+            cancelButtonText: '取消',
+            confirmButtonText: '确定',
+            type: 'warning',
+          })
+          .then(() => {
+              dandongOrder({}).toPromise()
+						.then((response) => {
+              this.$notify.success({
+                  title: '成功',
+                  message: '生成入库单成功',
+                })
+                this.getList()
+						})
+          })
+          .catch(() => {
+            return false
+          })
+      },
       agreementPrint() {
         var arr = []
         for (let i = 0; i < this.modification.length; i++) {
@@ -1396,45 +1418,52 @@
               // })
           }
         } else {
-          let _url1 = process.env.VUE_APP_BASE_API + '/identityAuthenticationInfo/api/getIdentityAuthenticationInfo'
-          let _url2 = process.env.VUE_APP_BASE_API + '/paymentManagement/getInfo'
-          this.$axios.all([
-            this.$axios.get(_url1, {
-              params: {
-                id: this.rowData.identityId,
-                authenticationStatusKey: 7,
-              }
-            }).then(res => res.data),
-            this.$axios.get(_url2, {
-              params: {
-                id: this.rowData.id
-              }
-            }).then(res => res.data)
-          ]).then(
-            this.$axios.spread((val1, val2) => {
-              // val 是数组中每个接口返回的值 res.data
-              console.log('两个接口全部加载完成', val1, val2);
-              this.printData = val2.data
-              console.log(this.printData)
-              if (val2.data.compName == '黑龙江秋收有限公司') {
-                this.printData.compName = '黑龙江中天昊元贸易有限公司'
-              }
-              this.isShowPrint = true
-              // if(this.printData.solidGrainPrice){
-              //   this.printData.solidGrainPrice = (this.printData.tidalGrainPrice * this.printData.netWeight)/this.printData.pureWeight
-              // }
-              let date = new Date()
-              this.printData.currentTime =
-                date.getFullYear() +
-                '年' +
-                Number(date.getMonth() + 1) +
-                '月' +
-                date.getDate() +
-                '日'
-            })
-          ).catch(err => {
-            console.log(err);
-          })
+          await getpaymentexamine({
+                    id: this.rowData.id,
+                  })
+                  .toPromise()
+                  .then((response) => {
+                    this.printData = response
+                    console.log(this.printData)
+                    if (response.compName == '黑龙江秋收有限公司') {
+                      this.printData.compName = '黑龙江中天昊元贸易有限公司'
+                    }
+                    this.isShowPrint = true
+                    // if(this.printData.solidGrainPrice){
+                    //   this.printData.solidGrainPrice = (this.printData.tidalGrainPrice * this.printData.netWeight)/this.printData.pureWeight
+                    // }
+                    let date = new Date()
+                    this.printData.currentTime =
+                      date.getFullYear() +
+                      '年' +
+                      Number(date.getMonth() + 1) +
+                      '月' +
+                      date.getDate() +
+                      '日'
+                  })
+          // let _url1 = process.env.VUE_APP_BASE_API + '/identityAuthenticationInfo/api/getIdentityAuthenticationInfo'
+          // let _url2 = process.env.VUE_APP_BASE_API + '/paymentManagement/getInfo'
+          // this.$axios.all([
+          //   this.$axios.get(_url1, {
+          //     params: {
+          //       id: this.rowData.identityId,
+          //       authenticationStatusKey: 7,
+          //     }
+          //   }).then(res => res.data),
+          //   this.$axios.get(_url2, {
+          //     params: {
+          //       id: this.rowData.id
+          //     }
+          //   }).then(res => res.data)
+          // ]).then(
+          //   this.$axios.spread((val1, val2) => {
+          //     // val 是数组中每个接口返回的值 res.data
+          //     console.log('两个接口全部加载完成', val1, val2);
+              
+            // })
+          // ).catch(err => {
+          //   console.log(err);
+          // })
           // getCustomerLook({
           //     id: this.rowData.identityId,
           //     authenticationStatusKey: 7,

src/views/houseSelfCollect/weightCheckRecord.vue

@@ -74,12 +74,13 @@
         <el-table-column prop="secretaryWeigher" label="司称员"></el-table-column>
         <el-table-column prop="grossDate" label="检斤时间"></el-table-column>
         <el-table-column prop="status" label="状态"></el-table-column>
-        <el-table-column label="操作" min-width="170">
+        <el-table-column label="操作" min-width="300">
           <template scope="scope">
             <!-- <el-button size="small" @click="print(scope.row)">打印</el-button> -->
             <el-button @click="print(scope.row)" v-if="scope.row.status == '已称皮重' || scope.row.status == '已称毛重'" v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button>
             <el-button @click="backInfo(scope.row)" v-if="scope.row.status == '已称皮重'">退回</el-button>
             <el-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.huan`" class="putstorage" @click="exchange(scope.row)" v-if="scope.row.status == '已称毛重'">换仓</el-button>
+            <el-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.huan`" class="putstorage" @click="exchangeNo(scope.row)" v-if="scope.row.status == '已称毛重'">换任务号</el-button>
             <el-button @click="deleteInfo(scope.row)" v-if="scope.row.status == '已称毛重'">删除</el-button>
           </template>
         </el-table-column>
@@ -166,6 +167,31 @@
             <el-button type="primary" @click="dialogVisibleconfirm">确 定</el-button>
           </span>
         </el-dialog>
+         <el-dialog
+          title="提示"
+          :visible.sync="dialogVisible1"
+          width="30%"
+          :before-close="handleClose1">
+          <div style="text-align:center">
+            <el-form ref="form" label-width="110px">
+              <el-form-item label="任务编号">
+             <el-select filterable clearable v-model="inOutTaskNo" placeholder="请选择任务号" class="typeselect"
+              @change="taskNoChange">
+              <el-option v-for="item in taskNolist" :key="item.inOutTaskNo" :label="item.inOutTaskNo"
+                :value="item.inOutTaskNo" />
+            </el-select>
+            </el-form-item>
+           <el-form-item label="合同编号">
+            <el-input v-model="contractNo" placeholder="合同编号" :disabled="disabled" maxlength="15">
+            </el-input>
+             </el-form-item>
+         </el-form>
+          </div>
+          <span slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible1 = false">取 消</el-button>
+            <el-button type="primary" @click="dialogVisibleconfirm1">确 定</el-button>
+          </span>
+        </el-dialog>
   </div>
 </template>
 <script>
@@ -175,9 +201,13 @@
     getPrint,
     returnInfo,
     changeNo,
+    changeTaskNo,
     importWordYk,
     getweighingDelete
   } from '@/model/houseSelfCollect/index'
+   import {
+    getReceiptTaskNo,
+  } from '@/model/warehouse/index'
   import {
     getcomp
   } from '@/model/indexRx'
@@ -254,6 +284,8 @@
         isShowPrint: false,
         dialogData: {},
         title: '',
+        disabled: true,
+        taskflag:2,
         modification: [],
         ewCustomerOptions: [{
           value: '天津建源供应链管理有限公司',
@@ -338,9 +370,14 @@
         startDate:'',
         endDate:'',
         dialogVisible:false,
+        dialogVisible1:false,
         binNumber:'',
         binnumberList:[],
+        taskNolist:[],
         cangweiNum:'',
+        contractNum:'',
+        inOutTaskNo:'',
+        contractNo:'',
         positionId:'',
         warehouseInOutDetail:{},
       }
@@ -392,7 +429,6 @@
           value: '黑龙江启兴粮食贸易有限公司',
           label: '黑龙江启兴粮食贸易有限公司'
         }]
-        
           this.ewCustomerOptions= [
           {
           value: '天津建源供应链管理有限公司',
@@ -612,9 +648,26 @@
           }
         }
       },
+      taskNoChange(e){
+        this.inOutTaskNo = e
+        for(let i = 0 ; i < this.taskNolist.length ; i++){
+          if(this.inOutTaskNo == this.taskNolist[i].inOutTaskNo){
+            if(this.taskNolist[i].contractNo){
+              this.contractNo = this.taskNolist[i].contractNo
+            }
+            else{
+              this.contractNo = this.taskNolist[i].moveTaskNo
+            }
+          }
+        }
+      },
       handleClose(){
         this.dialogVisible = false
       },
+      handleClose1(){
+        this.inOutTaskNo=''
+        this.dialogVisible1 = false
+      },
       dialogVisibleconfirm(){
         if(this.binNumber == this.cangweiNum){
           this.$message.error('已是该仓位无需修改')
@@ -642,7 +695,32 @@
             return false
           })
       },
-      
+      dialogVisibleconfirm1(){
+        if(this.contractNo == this.contractNum){
+          this.$message.error('已是该任务号无需修改')
+          return
+        }
+        this.$confirm(`确定修改任务号？`, {
+            cancelButtonText: '取消',
+            confirmButtonText: '确定',
+            type: 'warning',
+          })
+          .then(() => {
+              changeTaskNo({id:this.id,inOutTaskNo:this.inOutTaskNo,contractNo:this.contractNo}).toPromise()
+						.then((response) => {
+              this.$notify.success({
+                  title: '成功',
+                  message: '修改任务号成功',
+                })
+                this.getList()
+                this.inOutTaskNo=''
+                this.dialogVisible1=false
+						})
+          })
+          .catch(() => {
+            return false
+          })
+      },
         exchange(row){
           for(let i = 0 ; i < this.warehouseList.length; i++ ){
             if(this.warehouseName == this.warehouseList[i].warehouseName){
@@ -654,6 +732,25 @@
             this.cangweiNum = row.binNumber
             this.dialogVisible = true
        },
+       exchangeNo(row){
+        if (row.serviceManagementType == 1) {
+            this.taskflag=2
+          } else {
+            this.taskflag=3
+          }
+          getReceiptTaskNo({
+            flag: this.taskflag,
+            warehouseName: this.warehouseName,
+          })
+          .toPromise()
+          .then((response) => {
+            this.taskNolist = response
+          })
+            this.id = row.id
+            this.contractNo = row.contractNo
+            this.contractNum = row.contractNo
+            this.dialogVisible1 = true
+       },
        backInfo(row){
            this.$confirm('确定要退回该信息？', '提示', {
             confirmButtonText: '确定',
@@ -794,7 +891,6 @@
               }else{
                 this.dialogData.compName = this.companyName
               }
-              debugger
               if (this.checked) {
                 if(this.dialogData&&!this.dialogData.customer&&this.dialogData.contractManagement){
                   this.dialogData.customer = this.dialogData.contractManagement.seller

src/views/outboundManagement/weighingManagementrecord.vue

@@ -79,7 +79,7 @@
         </template>
       </el-table-column> -->
       <el-table-column prop="status" label="状态"></el-table-column>
-      <el-table-column width="300" prop="contractNo1" label="操作">
+      <el-table-column width="400" prop="contractNo1" label="操作">
         <template slot-scope="scope">
           <!-- <el-button @click="weighing(scope.row, 1)" v-if="scope.row.status != '已质检'"
             v-hasPermission="`outbound.acquisitionWeightOut.mao`">毛重</el-button>
@@ -90,6 +90,7 @@
           <el-button @click="del(scope.row)" v-if="scope.row.status == '已称皮重'"
             v-hasPermission="`outbound.acquisitionWeightOut.view`">删除</el-button>
              <el-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.huan`" class="putstorage" @click="exchange(scope.row)" v-if="scope.row.status == '已称皮重'">换仓</el-button>
+             <el-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.huan`" class="putstorage" @click="exchangeNo(scope.row)" v-if="scope.row.status == '已称皮重'">换任务号</el-button>
              <el-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.huan`" class="putstorage" @click="returnBack(scope.row)" v-if="scope.row.status == '已称毛重'">退回</el-button>
         </template>
       </el-table-column>
@@ -189,6 +190,31 @@
             <el-button type="primary" @click="dialogVisibleconfirm">确 定</el-button>
           </span>
         </el-dialog>
+        <el-dialog
+          title="提示"
+          :visible.sync="dialogVisible1"
+          width="30%"
+          :before-close="handleClose2">
+          <div style="text-align:center">
+            <el-form ref="form" label-width="110px">
+              <el-form-item label="任务编号">
+             <el-select filterable clearable v-model="inOutTaskNo" placeholder="请选择任务号" class="typeselect"
+              @change="taskNoChange">
+              <el-option v-for="item in taskNolist" :key="item.inOutTaskNo" :label="item.inOutTaskNo"
+                :value="item.inOutTaskNo" />
+            </el-select>
+            </el-form-item>
+           <el-form-item label="合同编号">
+            <el-input v-model="contractNo" placeholder="合同编号" :disabled="disabled" maxlength="15">
+            </el-input>
+             </el-form-item>
+         </el-form>
+          </div>
+          <span slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible1 = false">取 消</el-button>
+            <el-button type="primary" @click="dialogVisibleconfirm1">确 定</el-button>
+          </span>
+        </el-dialog>
   </div>
 </template>
 <script>
@@ -198,10 +224,14 @@
     delelteWeighing,
     getweighing,
     changeNo,
+    changeTaskNo,
     importWordSale,
     importWordYk,
     goBack
   } from '@/model/outboundManagement/index'
+  import {
+    getReceiptTaskNo,
+  } from '@/model/warehouse/index'
   import {
     EventBus
   } from 'base-core-lib'
@@ -240,9 +270,15 @@
         addressUrls: [],
         compId: localStorage.getItem('ws-pf_compId'),
         dialogVisible:false,
+        dialogVisible1:false,
         binNumber:'',
+        inOutTaskNo:'',
+        contractNo:'',
+        disabled: true,
         binnumberList:[],
+        taskNolist:[],
         cangweiNum:'',
+        contractNum:'',
         positionId:'',
         warehouseList1:[],
         
@@ -856,9 +892,26 @@
           }
         }
       },
+      taskNoChange(e){
+        this.inOutTaskNo = e
+        for(let i = 0 ; i < this.taskNolist.length ; i++){
+          if(this.inOutTaskNo == this.taskNolist[i].inOutTaskNo){
+            if(this.taskNolist[i].contractNo){
+              this.contractNo = this.taskNolist[i].contractNo
+            }
+            else{
+              this.contractNo = this.taskNolist[i].moveTaskNo
+            }
+          }
+        }
+      },
       handleClose1(){
         this.dialogVisible = false
       },
+      handleClose2(){
+        this.inOutTaskNo=''
+        this.dialogVisible1 = false
+      },
       exchange(row){
           for(let i = 0 ; i < this.warehouseList1.length; i++ ){
             if(this.warehouseName == this.warehouseList1[i].warehouseName){
@@ -870,6 +923,20 @@
             this.cangweiNum = row.binNumber
             this.dialogVisible = true
        },
+       exchangeNo(row){
+          getReceiptTaskNo({
+            flag: 1,
+            warehouseName: this.warehouseName,
+          })
+          .toPromise()
+          .then((response) => {
+            this.taskNolist = response
+          })
+            this.id = row.id
+            this.contractNo = row.contractNo
+            this.contractNum = row.contractNo
+            this.dialogVisible1 = true
+       },
        dialogVisibleconfirm(){
         if(this.binNumber == this.cangweiNum){
           this.$message.error('已是该仓位无需修改')
@@ -890,6 +957,7 @@
                   message: '修改仓位成功',
                 })
                 this.getList()
+                this.inOutTaskNo=''
                 this.dialogVisible=false
 						})
           })
@@ -897,6 +965,31 @@
             return false
           })
       },
+      dialogVisibleconfirm1(){
+        if(this.contractNo == this.contractNum){
+          this.$message.error('已是该任务号无需修改')
+          return
+        }
+        this.$confirm(`确定修改任务号？`, {
+            cancelButtonText: '取消',
+            confirmButtonText: '确定',
+            type: 'warning',
+          })
+          .then(() => {
+              changeTaskNo({id:this.id,inOutTaskNo:this.inOutTaskNo,contractNo:this.contractNo}).toPromise()
+						.then((response) => {
+              this.$notify.success({
+                  title: '成功',
+                  message: '修改任务号成功',
+                })
+                this.getList()
+                this.dialogVisible1=false
+						})
+          })
+          .catch(() => {
+            return false
+          })
+      },
       warehouseNameChange(e) {
         // this.warehouseName = e
         console.log(this.warehouseList)

src/views/profitable/component/routers/route.js

@@ -434,6 +434,22 @@ const profitableRouter = {
       },
       hidden:true,
     },
+        // 固定资产
+        {
+          path: 'fixedAssets',
+          component: () =>
+            import(/* webpackChunkName: "applDetail" */ '@/views/profitable/fixedAssets'),
+          name: 'fixedAssets',
+          meta: {
+            title: 'fixedAssets',
+            shortcutEntrance: 'profitable',
+            module: 'lirunhesuan.feiyongguanli.view',
+            permissicon: [],
+            keepAlive: true,
+            _title:'固定资产'
+            // module: 'procurement.sparepart.applDetail'
+          }
+        },
 
       // // 收支明细
       // {

src/views/profitable/contractinventory.vue

@@ -56,7 +56,7 @@
     components: {},
     data() {
       return {
-        value: "",
+        value: '',
         tableData: [],
         deptBudgetTotal: 0,
         contractList:[],
@@ -64,10 +64,10 @@
         pageSize: 10,
         deptCircularPage: {},
         taskTypeList:[],
-        searchType:"",
-        searchKeyWord:"",
-        startDate:"",
-        endDate:"",
+        searchType:'',
+        searchKeyWord:'',
+        startDate:'',
+        endDate:'',
         name:'',
         outtotal:0,
         intotal:0,
@@ -178,7 +178,8 @@
           .then(response => {
             if(response.records.length){
               for (let i = 0; i < response.records.length; i++) {
-                response.records[i].weight=response.records[i].inStorage-response.records[i].removeStorage-response.records[i].saleStorage-response.records[i].loss-response.records[i].surplus
+                response.records[i].weight=Number(response.records[i].inStorage-
+                    response.records[i].removeStorage-response.records[i].saleStorage-response.records[i].loss-response.records[i].surplus).toFixed(3)
               }
             }
             this.tableData = response.records

src/views/profitable/contractprofitsdetails.vue

@@ -174,7 +174,7 @@
     components: {},
     data() {
       return {
-        value: "",
+        value: '',
         tableData: [],
         show:false,
         correlationshow:false,
@@ -183,12 +183,12 @@
         pageSize: 10,
         agreementType:'',
         deptCircularPage: {},
-        searchType:"",
-        searchKeyWord:"",
-        startDate:"",
+        searchType:'',
+        searchKeyWord:'',
+        startDate:'',
         searchContractType:'',
         searchTypeCon:'',
-        endDate:"",
+        endDate:'',
         outtotal:0,
         intotal:0,
         contractList:[],
@@ -301,23 +301,34 @@
       cost(row){
         this.$router.push({name:'contractcost',query:{contractNo:row.contractNo,contractType:row.contractType,buyer:row.buyer,seller:row.seller}})
       },
-      getPassYearFormatDate () {
-             var _date = new Date()
-            var year1 = _date.getFullYear()
-            var month1 = _date.getMonth() + 1
-            var strDate1 = _date.getDate()
-            if (month1 >= 1 && month1 <= 9) {
-              month1 = '0' + month1
-            }
-            if (strDate1 >= 0 && strDate1 <= 9) {
-              strDate1 = '0' + strDate1
-            }
-            this.startDate = year1 + '-' + (month1-1) +'-' + strDate1
-            this.endDate = year1 + '-' + month1 +'-' + strDate1
-            this.value=[this.startDate,this.endDate]
-            this.getList()
-          // })
-        },
+      getPassYearFormatDate() {
+        var _date = new Date()
+        var nowDate = new Date()
+        nowDate.setTime(nowDate.getTime() - 24 * 60 * 60 * 1000 * 30)
+        var year = nowDate.getFullYear()
+        var year1 = _date.getFullYear()
+        var month = nowDate.getMonth() + 1
+        var month1 = _date.getMonth() + 1
+        var strDate = nowDate.getDate()
+        var strDate1 = _date.getDate()
+        if (month >= 1 && month <= 9) {
+          month = '0' + month
+        }
+        if (month1 >= 1 && month1 <= 9) {
+          month1 = '0' + month1
+        }
+        if (strDate >= 0 && strDate <= 9) {
+          strDate = '0' + strDate
+        }
+        if (strDate1 >= 0 && strDate1 <= 9) {
+          strDate1 = '0' + strDate1
+        }
+        this.startDate = year + '-' + month + '-' + strDate
+        this.endDate = year1 + '-' + month1 + '-' + strDate1
+        this.value = [this.startDate, this.endDate]
+        this.getList()
+        // })
+      },
       async getList() {
          var response=await getcontractdetails({
             // warehouseType: 1,

src/views/profitable/expensemanagementdetails.vue

@@ -185,7 +185,7 @@
                   scope.row.status == '已付款' &&
                   !scope.row.approveStatus)
               " @click="accomplish(scope.row)" type="primary">完成</el-button>
-              <el-button v-if="scope.row.approveStatus && scope.row.approveStatus !='发起人撤回' " @click="withdraw(scope.row)" type="primary">撤回</el-button>
+              <el-button v-if="scope.row.approveStatus && scope.row.approveStatus !='发起人撤回' " v-show="scope.row.showFlag"  @click="withdraw(scope.row)" type="primary">撤回</el-button>
               <el-button v-if="scope.row.status == '已驳回' || scope.row.approveStatus == '发起人撤回'" @click="edit(scope.row)" type="primary">编辑</el-button>
               <el-button v-if="
                 (!scope.row.distributionStatus &&
@@ -331,7 +331,7 @@ export default {
       deptBudgetTotal: 0,
       currentPage: 1,
       pageSize: 10,
-      
+      showFlag:false,
       size: 100,
       expensesPurpose: '',
       recordList: [],
@@ -888,6 +888,9 @@ export default {
                 response.records[i].addressUrlArray =
                   response.records[i].addressUrl.split(',')
               }
+              if (response.records[i].agent == localStorage.getItem('ws-pf_staffName')) {
+                response.records[i].showFlag = true
+              }
             }
           }
           this.tableData = response.records
@@ -902,7 +905,6 @@ export default {
               Number(this.tableData[0].outWarehouseMoney) +
               Number(this.tableData[0].outManageMoney)
           }
-
           this.deptBudgetTotal = response.total
         })
     },

src/views/profitable/fixedAssets.vue

@@ -0,0 +1,1001 @@
+//固定资产
+<template>
+    <div class="container">
+        <el-row class="row_top">
+            <el-col :span="12">
+                <h2 class="bg-left title">固定资产</h2>
+            </el-col>
+        </el-row>
+        <div class="center">
+            <el-row style="margin-bottom: 10px">
+                <!-- <el-col :span="6">
+                          <el-date-picker value-format="yyyy-MM-dd" v-model="value" type="daterange" align="right" unlink-panels
+                            range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions"
+                            class="data_css" @change="changeDate">
+                          </el-date-picker>
+                    </el-col> -->
+                <el-col :span="18">
+                    <div class="datascreen">
+                        <el-select v-model="deptAndWarehouse" filterable placeholder="按所属部门/库点查找" clearable
+                            @change="getList" class="options_css">
+                            <el-option v-for="(item, index) in deptAndWarehouseList" :key="index" :label="item"
+                                :value="item" />
+                        </el-select>
+                        <ws-input v-model="searchKeyWord" placeholder="可按名称查找" clearable maxlength="500" type="input"
+                            class="findValue" @keyup.enter.native="find()"></ws-input>
+                        <el-button class="find" type="primary" @click="find()"><img width="16" height="16"
+                                style="left: -8px" src="../../../public/img/sousuo.png" alt="" /></el-button>
+                    </div>
+                </el-col>
+                <el-col :span="4" style="display: flex;">
+                    <el-button @click="batchDel()" style="dis">批量删除</el-button>
+                    <!-- <el-upload action="" :on-change="batchImport" :show-file-list="false"
+                            accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
+                            :auto-upload="false">
+                            <el-button>批量导入</el-button>
+                        </el-upload> -->
+                    <el-button @click="batchImport()">导入</el-button>
+                    <el-link
+                        href="https://taohaoliang.oss-cn-beijing.aliyuncs.com/pcfiles/%E5%9B%BA%E5%AE%9A%E8%B5%84%E4%BA%A7%E4%BF%A1%E6%81%AF%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xlsx"
+                        style="margin-left: 8px">
+                        <el-button>模板下载</el-button>
+                    </el-link>
+                    <el-button style="margin-left: 8px" @click="addOrEdit(1)">添加</el-button>
+                </el-col>
+            </el-row>
+            <el-row style="margin-bottom: 10px">
+                <el-col :span="18" style="width: 88%;">
+                    <el-button style="margin-left: 30px !important" @click="statusChange('')"
+                        :type="searchType == '' ? 'primary' : ''">全部</el-button>
+                    <el-button @click="statusChange(1)" :type="searchType == 1 ? 'primary' : ''">在用</el-button>
+                    <el-button @click="statusChange(3)" :type="searchType == 3 ? 'primary' : ''">闲置</el-button>
+                    <el-button @click="statusChange(5)" :type="searchType == 5 ? 'primary' : ''">报废</el-button>
+                    <el-button @click="statusChange(7)" :type="searchType == 7 ? 'primary' : ''">转卖</el-button>
+                </el-col>
+                <el-col style="text-align: right" :span="30">
+                    <span>合计：{{ allTotalPrice }} 元</span>
+                </el-col>
+            </el-row>
+            <div class="fromdata">
+                <el-table :data="fixedAssetsInfoList" ref="table" style="width: 100%; margin-top: 20px" border
+                    height="calc(130% - 170px)" @row-click="handleRowClick" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="30"></el-table-column>
+                    <el-table-column type="index" label="序号">
+                        <template scope="scope">
+                            <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+                            <span v-else>{{ scope.$index + 1 }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="itemName" label="名称" width="100"></el-table-column>
+                    <el-table-column prop="deptAndWarehouse" label="所属部门/库点" width="150"></el-table-column>
+                    <el-table-column prop="businessType" label="类型" width="150"></el-table-column>
+                    <el-table-column prop="leadingCadre" label="负责人"></el-table-column>
+                    <el-table-column prop="purchaseQuantity" label="数量"></el-table-column>
+                    <el-table-column prop="purchasePrice" width="120" label="采购单价（元）"></el-table-column>
+                    <el-table-column prop="currentPrice" width="120" label="当前单价（元）"></el-table-column>
+                    <el-table-column prop="totalPrice" width="120" label="总价（元）"></el-table-column>
+                    <!-- <el-table-column prop="expenseRemarks" label="附件">
+                                <template slot-scope="scope">
+                                  <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
+                                    src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
+                                  <span v-if="scope.row.addressUrlArray != null">
+                                    {{
+                                        scope.row.addressUrlArray.length == 0
+                                          ? ''
+                                          : scope.row.addressUrlArray.length
+                                    }}
+                                  </span>
+                                </template>
+                        </el-table-column> -->
+                    <el-table-column prop="status" label="状态" width="100">
+                        <template slot-scope="scope">
+                            <div>
+                                <el-select v-model="scope.row.status" placeholder="" class="statusselect"
+                                    @change='editStatus($event, scope.row)' :value="scope.row.status">
+                                    <el-option v-for="item in statusList" :key="item.value" :label="item.value"
+                                        :value="item.value" style="color: #8890b1" />
+                                </el-select>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="purchaseDate" label="采购日期" width="150"></el-table-column>
+                    <el-table-column prop="remark" width="120" label="备注">
+                        <template scope="scope">
+                            <div v-if="!scope.row.select" @click.stop="lookRemark(scope.row)">
+                                <span class="text_css">查看</span>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="address" label="操作" width="220">
+                        <template slot-scope="scope">
+                            <el-button @click="addOrEdit(2, scope.row)" type="primary">编辑</el-button>
+                            <el-button @click="del(scope.row)" type="danger">删除</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                :current-page="currentPage" style="text-align: center" :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+            </el-pagination>
+        </div>
+        <!-- 添加/编辑弹窗 -->
+        <el-dialog width="25%" :visible.sync="fixedAssetsForm" :append-to-body="true" :title="title">
+            <div class="tanchuang">
+                <el-form>
+                    <el-form-item label="所属部门/库点" prop="deptAndWarehouse" label-width="110px">
+                        <el-select style="width:100%" v-model="fixedAssetsInfo.deptAndWarehouse"
+                            placeholder="按所属部门/库点查找" clearable filterable>
+                            <!-- @change="selectDeptAndWare" -->
+                            <el-option v-for="(item, index) in deAndWareFormList" :key="index" :label="item"
+                                :value="item" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="类型" prop="businessType" label-width="110px">
+                        <el-select style="width:100%" v-model="fixedAssetsInfo.businessType" placeholder=""
+                            @change='selectTypeChange' :value="businessType">
+                            <el-option v-for="item in typeList" :key="item.value" :label="item.value"
+                                :value="item.value" style="color: #8890b1" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="名称" prop="itemName" label-width="110px">
+                        <el-input v-model="fixedAssetsInfo.itemName" placeholder="输入名称，2-10个字" maxlength="10"
+                            size="small" />
+                    </el-form-item>
+                    <el-form-item label="数量" prop="purchaseQuantity" label-width="110px">
+                        <el-input type="number" @input="calculation" @mousewheel.native.prevent
+                            v-model="fixedAssetsInfo.purchaseQuantity" placeholder="输入数量" maxlength="10" size="small" />
+                    </el-form-item>
+                    <el-form-item label="状态" span="1" prop="status" class="readonly" label-width="110px">
+                        <el-select style="width:100%" v-model="fixedAssetsInfo.status" placeholder="" class="typeselect"
+                            @change="selectStatus">
+                            <ws-option v-for="item in statusList" :key="item.value" :label="item.value"
+                                :value="item.value" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="负责人" prop="leadingCadre" label-width="110px">
+                        <el-select style="width:100%" v-model="fixedAssetsInfo.leadingCadre" placeholder="请选择负责人"
+                            filterable clearable>
+                            <!-- @change="selectLead" -->
+                            <el-option v-for="item in leadingCadreList" :key="item" :label="item" :value="item" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="采购单价(元)" prop="purchasePrice" label-width="110px">
+                        <el-input type="number" @input="calculation" v-model="fixedAssetsInfo.purchasePrice"
+                            placeholder="请输入采购单价(元)" maxlength="100" size="small" />
+                    </el-form-item>
+                    <el-form-item label="当前单价(元)" prop="currentPrice" label-width="110px">
+                        <el-input type="number" @mousewheel.native.prevent v-model="fixedAssetsInfo.currentPrice"
+                            placeholder="请输入当前单价(元)" maxlength="100" size="small" />
+                    </el-form-item>
+                    <el-form-item label="总价(元)" prop="totalPrice" label-width="110px">
+                        <el-input type="number" @mousewheel.native.prevent v-model="fixedAssetsInfo.totalPrice"
+                            placeholder="自动计算，不可编辑" maxlength="100" size="small" disabled />
+                    </el-form-item>
+                    <el-form-item label="采购日期" prop=" purchaseDate" label-width="110px">
+                        <el-date-picker v-model="fixedAssetsInfo.purchaseDate" placeholder="请选择采购日期" type="date"
+                            value-format="yyyy-MM-dd"></el-date-picker>
+                    </el-form-item>
+                    <el-form-item label="备注" prop="remark" label-width="110px">
+                        <el-input v-model="fixedAssetsInfo.remark" placeholder="输入备注，0-500个字" maxlength="500" row="5"
+                            type="textarea" size="small" />
+                    </el-form-item>
+                    <!-- <ws-form-item label="上传截图" prop=" paymentScreenshot"></ws-form-item>
+                    <div class="upLoad">
+                      <el-upload class="avatar-uploader" :action="global.uploadPath" :show-file-list="false"
+                        :on-success="handleAvatarSuccess">
+                        <img v-if="imageUrl" :src="imageUrl" class="avatar" />
+                        <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                      </el-upload>
+                    </div> -->
+                    <div style="text-align: center; margin-top: 20px">
+                        <el-button @click="cancel()">取消</el-button>
+                        <el-button @click="fixedAassetsSubmit(flag)">提交</el-button>
+                    </div>
+                </el-form>
+            </div>
+        </el-dialog>
+        <!--备注弹窗-->
+        <el-dialog width='30%' :visible.sync="remarkList" title="备注" top="20vh">
+            <span>{{ remark }}</span>
+        </el-dialog>
+        <!--导入弹窗-->
+        <div class="mask" v-show="isShowImportType"></div>
+        <div class="print-type" v-show="isShowImportType">
+            <div class="print-type-content">
+                <div class="print-type-checkbox">
+                    <el-form ref="form" label-width="110px">
+                        <!--所属部门/库点-->
+                        <el-form-item label="所属部门/库点" span="1" prop="deptAndWarehouse">
+                            <el-select v-model="deptAndWarehouse" filterable placeholder="按所属部门/库点查找" clearable
+                                @change="deAndWareChange" class="options_css">
+                                <el-option v-for="item in deAndWareList" :key="item" :label="item" :value="item" />
+                            </el-select>
+                        </el-form-item>
+                    </el-form>
+                </div>
+            </div>
+            <div class="bottom-btn">
+                <el-upload action="" :on-change="submitImport" style="margin-left:75px;" :show-file-list="false"
+                    accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
+                    :auto-upload="false">
+                    <el-button>确定</el-button>
+                </el-upload>
+                <el-button style="margin-left:50px;" @click="cancelImport">取消</el-button>
+            </div>
+        </div>
+        <!-- <WinseaContentModal v-model="fujianshow" :title="title" @on-cancel="handleClose">
+                    <ws-upload :editable="false" ref="upload" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx"
+                        :comp-id="compId" :appendix-ids="appendixIdss" :size-limit="size" />
+                </WinseaContentModal> -->
+    </div>
+</template>
+<script>
+import WsUpload from '@/components/WsUpload'
+import {
+    getFixedInfoList,
+    getLeadingCadre,
+    getDeptAndWare,
+    delFixedInfo,
+    batchDelFixedInfo,
+    addOrEditFixedInfo,
+    lookFixedInfo,
+    importFixed
+} from '@/model/profitable/index'
+export default {
+    components: {
+        WsUpload,
+    },
+    data() {
+        return {
+            value: '',
+            deptBudgetTotal: 0,
+            currentPage: 1,
+            pageSize: 10,
+            size: 100,
+            compId: localStorage.getItem('ws-pf_compId'),
+            searchType: '',
+            searchKeyWord: '',
+            deptAndWarehouse: [],//所属部门/库点
+            deptAndWarehouseList: [],
+            deAndWareList: [],
+            deAndWareFormList: [],
+            leadingCadre: [],//负责人
+            leadingCadreList: [],
+            statusFlag: 1,
+            status: '在用',
+            allTotalPrice: 0,
+            statusList: [
+                {
+                    value: '在用',
+                    type: 1
+                },
+                {
+                    value: '闲置',
+                    type: 3
+                },
+                {
+                    value: '报废',
+                    type: 5
+                },
+                {
+                    value: '转卖',
+                    type: 7
+                },
+            ],
+            typeList: [
+                {
+                    value: '自营',
+                    type: 1
+                },
+                {
+                    value: '合营',
+                    type: 3
+                },
+            ],
+            modification: [],
+            fixedAssetsInfoList: [],
+            fixedAssetsInfo: {
+                status: '在用',
+                statusFlag: 1,
+                businessType: '自营',
+                businessTypeKey: 1,
+                purchaseDate: '',
+                totalPrice: '',
+                deptAndWarehouse: '公司资产',
+                leadingCadre: '',
+            },
+            fixedAssetsForm: false,
+            businessType: '自营',
+            businessTypeKey: 1,
+            itemName: '',
+            purchaseDate: '',
+            remark: '',
+            purchaseQuantity: '',
+            purchasePrice: '',
+            currentPrice: '',
+            title: '',
+            flag: '',
+            remarkList: false,
+            isShowImportType: false,
+        }
+    },
+    activated() {
+        this.getList()
+        this.xiala()
+    },
+    methods: {
+        handleSelectionChange(val) {
+            this.modification = val
+        },
+        handleRowClick(row) {
+            return true
+        },
+        deAndWareChange(e) {
+            for (let i = 0; i < this.deptAndWarehouseList.length; i++) {
+                if (this.deptAndWarehouseList[i] == this.deptAndWarehouse) {
+                    this.deptAndWarehouse = this.deptAndWarehouseList[i]
+                    localStorage.setItem('houseSelfCollect_house1',
+                        JSON.stringify({
+                            value: this.deptAndWarehouseList[i],
+                            compId: localStorage.getItem('ws-pf_compId')
+                        })
+                    )
+                }
+            }
+        },
+        //导入
+        batchImport() {
+            // this.$forceUpdate();
+            this.isShowImportType = true
+        },
+        cancelImport() {
+            this.deptAndWarehouse = ''
+            this.isShowImportType = false
+        },
+        submitImport(file, fileList) {
+            this.fileTemp = file.raw
+            let fileName = file.raw.name
+            let fileType = fileName.substring(fileName.lastIndexOf('.') + 1)
+            // 判断上传文件格式
+            if (this.fileTemp) {
+                if (fileType == 'xlsx' || fileType == 'xls') {
+                    this.importf(this.fileTemp)
+                } else {
+                    this.$message({
+                        type: 'warning',
+                        message: '附件格式错误，请删除后重新上传！',
+                    })
+                }
+            } else {
+                this.$message({
+                    type: 'warning',
+                    message: '请上传附件！',
+                })
+            }
+        },
+        importf(obj) {
+            this.excelFreightspace = []
+            let _this = this;
+            let inputDOM = this.$refs.inputer; // 通过DOM取文件数据
+            this.file = event.currentTarget.files[0];
+            var rABS = false; //是否将文件读取为二进制字符串
+            var f = this.file;
+            var reader = new FileReader();
+            //if (!FileReader.prototype.readAsBinaryString) {
+            FileReader.prototype.readAsBinaryString = function (f) {
+                var binary = '';
+                var rABS = false; //是否将文件读取为二进制字符串
+                var pt = this;
+                var wb; //读取完成的数据
+                var outdata;
+                var reader = new FileReader();
+                reader.onload = function (e) {
+                    var bytes = new Uint8Array(reader.result);
+                    var length = bytes.byteLength;
+                    for (var i = 0; i < length; i++) {
+                        binary += String.fromCharCode(bytes[i]);
+                    }
+                    var XLSX = require('xlsx');
+                    if (rABS) {
+                        wb = XLSX.read(btoa(fixdata(binary)), { //手动转化
+                            type: 'base64',
+                            cellDates: true
+                        });
+                    } else {
+                        wb = XLSX.read(binary, {
+                            type: 'binary'
+                        });
+                    }
+                    // outdata就是你想要的东西 excel导入的数据
+                    outdata = XLSX.utils.sheet_to_json(wb.Sheets[wb.SheetNames[0]]);
+                    // excel 数据再处理
+                    let arr = []
+                    outdata.map(v => {
+                        // let jsonString = JSON.stringify(v).replace(/\*/g, '').replace(/\s/ig,'');
+                        let jsonString = JSON.stringify(v).replace(/\//g, '').replace(/\s/ig, '');
+                        v = JSON.parse(jsonString);
+                        let obj = {}
+                        //xxx代表列名
+                        obj.itemName = v.名称
+                        obj.leadingCadre = v.负责人
+                        obj.purchaseQuantity = v.数量
+                        obj.purchasePrice = v.采购单价
+                        obj.currentPrice = v.当前单价
+                        obj.status = v.状态
+                        obj.businessType = v.经营方式
+                        obj.remark = v.备注
+                        obj.purchaseDate = _this.formatDate(v.采购日期, '-')
+                        _this.excelFreightspace.push(obj)
+                    })
+                    if (_this.excelFreightspace) {
+                        importFixed({
+                            compId: localStorage.getItem('ws-pf_compId'),
+                            deptAndWarehouse: _this.deptAndWarehouse,
+                            fixedAssetsInfoList: _this.excelFreightspace
+                        }).toPromise()
+                            .then((response) => {
+                                if (response == 'ok') {
+                                    _this.$notify({
+                                        title: '成功',
+                                        message: '导入成功',
+                                        type: 'success'
+                                    });
+                                }
+                                _this.deAndWareChange = ''
+                                _this.isShowImportType = false
+                                _this.getList()
+                            })
+                    }
+                }
+                reader.readAsArrayBuffer(f);
+            }
+            if (rABS) {
+                reader.readAsArrayBuffer(f);
+            } else {
+                reader.readAsBinaryString(f);
+            }
+        },
+        formatDate(numb, format) {
+            const old = numb - 1;
+            const t = Math.round((old - Math.floor(old)) * 24 * 60 * 60);
+            const time = new Date(1900, 0, old, 0, 0, t)
+            const year = time.getFullYear();
+            const month = time.getMonth() + 1;
+            const date = time.getDate();
+            return year + format + (month < 10 ? '0' + month : month) + format + (date < 10 ? '0' + date : date) +
+                ' 00:00:00'
+        },
+        typeChange(num) {
+            this.searchType = num
+            this.getList()
+        },
+        // getPassYearFormatDate() {
+        //   var nowDate = new Date()
+        //   var _date = new Date()
+        //   nowDate.setTime(nowDate.getTime() - 24 * 60 * 60 * 1000 * 30)
+        //   var year = nowDate.getFullYear()
+        //   var year1 = _date.getFullYear()
+        //   var month = nowDate.getMonth() + 1
+        //   var month1 = _date.getMonth() + 1
+        //   var strDate = nowDate.getDate()
+        //   var strDate1 = _date.getDate()
+        //   if (month >= 1 && month <= 9) {
+        //     month = '0' + month
+        //   }
+        //   if (month1 >= 1 && month1 <= 9) {
+        //     month1 = '0' + month1
+        //   }
+
+        //   if (strDate >= 0 && strDate <= 9) {
+        //     strDate = '0' + strDate
+        //   }
+        //   if (strDate1 >= 0 && strDate1 <= 9) {
+        //     strDate1 = '0' + strDate1
+        //   }
+        //   this.startDate = year + '-' + month + '-' + strDate
+        //   this.endDate = year1 + '-' + month1 + '-' + strDate1
+        //   this.value = [this.startDate, this.endDate]
+        // },
+        // changeDate() {
+        //   if (this.value) {
+        //     this.startDate = this.value[0]
+        //     this.endDate = this.value[1]
+        //   }
+        //   this.getList()
+        // },
+        // fujian(row) {
+        //   this.id = row.id
+
+        //   if (row.addressUrl) {
+        //     this.appendixIdss = row.addressUrl
+        //     this.fujianshow = true
+        //   } else {
+        //     this.$message({
+        //       message: '暂无附件查看!',
+        //       type: 'warning',
+        //     })
+        //   }
+        // },
+        lookRemark(row) {
+            if (row.remark) {
+                this.remark = row.remark
+                this.remarkList = true
+            }
+            else {
+                this.$message({
+                    message: '暂无备注',
+                    type: 'warning'
+                });
+            }
+        },
+        getList() {
+            getFixedInfoList({
+                compId: localStorage.getItem('ws-pf_compId'),
+                searchKeyWord: this.searchKeyWord,
+                currentPage: this.currentPage,
+                pageSize: this.pageSize,
+                searchType: this.searchType,
+                deptAndWarehouse: this.deptAndWarehouse.length > 0 ? this.deptAndWarehouse.toString() : '',
+            })
+                .toPromise()
+                .then((response) => {
+                    //   if (response.records.length > 0) {
+                    //     for (let i = 0; i < response.records.length; i++) {
+                    //       if (response.records[i].addressUrl) {
+                    //         response.records[i].addressUrlArray =
+                    //           response.records[i].addressUrl.split(',')
+                    //       }
+                    //     }
+                    //   }
+                    this.fixedAssetsInfoList = response.records
+                    this.allTotalPrice = 0
+                    for (var i = 0; i < this.fixedAssetsInfoList.length; i++) {
+                        if (this.fixedAssetsInfoList[i].statusFlag != '7') {
+                            this.allTotalPrice += Number(this.fixedAssetsInfoList[i].totalPrice)
+                        }
+                        this.fixedAssetsInfoList[i].select = false
+                    }
+                    this.allTotalPrice = this.allTotalPrice.toFixed(2)
+                    this.deptBudgetTotal = response.total
+                })
+        },
+        getNowTime() {
+            var now = new Date();
+            var year = now.getFullYear(); //得到年份
+            var month = now.getMonth(); //得到月份
+            var date = now.getDate(); //得到日期
+            month = month + 1;
+            month = month.toString().padStart(2, '0');
+            date = date.toString().padStart(2, '0');
+            var defaultDate = `${year}-${month}-${date}`
+            this.fixedAssetsInfo.purchaseDate = defaultDate
+        },
+        statusChange(num) {
+            this.searchType = num
+            this.getList()
+        },
+        editStatus(e, row) {
+            for (var i = 0; i < this.statusList.length; i++) {
+                if (this.statusList[i].value == e) {
+                    this.statusFlag = this.statusList[i].type
+                }
+            }
+            var data = {}
+            var text = `是否将状态改为${e}`
+            data = {
+                id: row.id,
+                status: e,
+                statusFlag: this.statusFlag
+            }
+            this.$confirm(text, {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+            })
+                .then(() => {
+                    addOrEditFixedInfo(data)
+                        .toPromise()
+                        .then((response) => {
+                            this.$notify.success({
+                                title: '成功',
+                                message: '状态修改成功',
+                            })
+                            this.getList()
+                        })
+                        .catch((response) => {
+                            // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+                        })
+                })
+                .catch(() => {
+                    row.status = row.currectstatus
+                    return false
+                })
+
+        },
+        del(row) {
+            this.$confirm('确定删除固定资产信息？', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+            }).then(() => {
+                delFixedInfo({ id: row.id })
+                    .toPromise()
+                    .then((response) => {
+                        this.$message({
+                            message: '删除成功',
+                            type: 'success',
+                        })
+                        this.getList()
+                    })
+                    .catch((response) => {
+                        this.$message({
+                            message: '删除失败',
+                            type: 'warning',
+                        })
+                    })
+            })
+        },
+        batchDel() {
+            this.fixedAssetsInfo.fixedAssetsInfoList = this.modification
+            if (this.modification.length == 0) {
+                this.$message.warning('请选择要删除的条目')
+            } else {
+                this.$confirm('确定批量删除固定资产信息？', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning',
+                }).then(() => {
+                    batchDelFixedInfo(this.fixedAssetsInfo)
+                        .toPromise()
+                        .then((response) => {
+                            this.$message({
+                                message: '批量删除成功',
+                                type: 'success',
+                            })
+                            this.getList()
+                        })
+                        .catch((response) => {
+                            this.$message({
+                                message: '批量删除失败',
+                                type: 'warning',
+                            })
+                        })
+                })
+            }
+        },
+        xiala() {
+            //所属部门/库点下拉列表
+            getDeptAndWare({
+                compId: localStorage.getItem('ws-pf_compId'),
+            })
+                .toPromise()
+                .then((response) => {
+                    this.deptAndWarehouseList = response
+                    this.deAndWareList = response
+                    this.deAndWareFormList = response
+                })
+            //负责人下拉列表
+            getLeadingCadre({
+                compId: localStorage.getItem('ws-pf_compId'),
+            })
+                .toPromise()
+                .then((response) => {
+                    this.leadingCadreList = response
+                })
+        },
+        calculation() {
+            if (this.fixedAssetsInfo.purchaseQuantity && this.fixedAssetsInfo.purchasePrice) {
+                this.fixedAssetsInfo.totalPrice =
+                    Number(this.fixedAssetsInfo.purchaseQuantity *
+                    this.fixedAssetsInfo.purchasePrice).toFixed(2)
+            }
+        },
+        selectTypeChange(e) {
+            for (var i = 0; i < this.typeList.length; i++) {
+                if (this.typeList[i].value == e) {
+                    this.fixedAssetsInfo.businessTypeKey = this.typeList[i].type
+                }
+            }
+
+        },
+        selectStatus(e) {
+            for (var i = 0; i < this.statusList.length; i++) {
+                if (this.statusList[i].value == e) {
+                    this.fixedAssetsInfo.statusFlag = this.statusList[i].type
+                }
+            }
+        },
+        addOrEdit(flag, row) {
+            this.flag = flag
+            if (flag == 1) {
+                this.title = '添加'
+            } else if (flag == 2) {
+                this.title = '编辑'
+                // this.lookFixedInfo(row.id)
+                lookFixedInfo({
+                    id: row.id
+                })
+                    .toPromise()
+                    .then((response) => {
+                        this.fixedAssetsInfo = response
+                    })
+            }
+            this.getNowTime()
+            this.fixedAssetsForm = true
+        },
+        // lookFixedInfo(){
+        // },
+        fixedAassetsSubmit() {
+            var title
+            if (!this.fixedAssetsInfo.itemName) {
+                this.$message({
+                    message: '物品名称不能为空！',
+                    type: 'warning',
+                })
+                return
+            }
+            if (!this.fixedAssetsInfo.purchaseQuantity) {
+                this.$message({
+                    message: '采购数量不能为空！',
+                    type: 'warning',
+                })
+                return
+            }
+            if (this.fixedAssetsInfo.purchaseQuantity <= 0) {
+                this.$message({
+                    message: '数量输入有误',
+                    type: 'warning',
+                })
+                return
+            }
+            if (!this.fixedAssetsInfo.purchasePrice) {
+                this.$message({
+                    message: '采购单价不能为空',
+                    type: 'warning',
+                })
+                return
+            }
+            if (
+                isNaN(this.fixedAssetsInfo.purchasePrice) ||
+                (String(this.fixedAssetsInfo.purchasePrice).indexOf('.') != -1 &&
+                    String(this.fixedAssetsInfo.purchasePrice).length -
+                    (String(this.fixedAssetsInfo.purchasePrice).indexOf('.') + 1) >
+                    2) ||
+                this.fixedAssetsInfo.purchasePrice <= 0
+            ) {
+                this.$message({
+                    message: '采购单价输入有误！',
+                    type: 'warning',
+                })
+                return
+            }
+            if (!this.fixedAssetsInfo.currentPrice) {
+                this.$message({
+                    message: '当前单价不能为空',
+                    type: 'warning',
+                })
+                return
+            }
+            if (
+                isNaN(this.fixedAssetsInfo.currentPrice) ||
+                (String(this.fixedAssetsInfo.currentPrice).indexOf('.') != -1 &&
+                    String(this.fixedAssetsInfo.currentPrice).length -
+                    (String(this.fixedAssetsInfo.currentPrice).indexOf('.') + 1) >
+                    2) ||
+                this.fixedAssetsInfo.currentPrice <= 0
+            ) {
+                this.$message({
+                    message: '当前单价输入有误！',
+                    type: 'warning',
+                })
+                return
+            }
+            if (this.flag == 1) {
+                title = '确定提交资产信息？'
+            } else {
+                title = '确定提交本次修改？'
+            }
+            this.$confirm(title, '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+            })
+                .then(() => {
+                    this.fixedAssetsInfo.compId =
+                        localStorage.getItem('ws-pf_compId')
+                    addOrEditFixedInfo(this.fixedAssetsInfo)
+                        .toPromise()
+                        .then((response) => {
+                            this.$message.success('提交成功')
+                            this.fixedAssetsInfo = {
+                                status: '在用',
+                                statusFlag: 1,
+                                businessType: '自营',
+                                businessTypeKey: 1,
+                                purchaseDate: '',
+                                totalPrice: '',
+                                deptAndWarehouse: '公司资产',
+                                leadingCadre: '',
+                            }
+                            this.fixedAssetsForm = false
+                            this.getList()
+                        })
+                })
+                .catch(() => {
+                    return false
+                })
+        },
+        cancel() {
+            this.fixedAssetsForm = false
+            this.fixedAssetsInfo = {
+                status: '在用',
+                statusFlag: 1,
+                businessType: '自营',
+                businessTypeKey: 1,
+                purchaseDate: '',
+                totalPrice: '',
+                deptAndWarehouse: '',
+                leadingCadre: '',
+            }
+        },
+        pickerOptions() { },
+        find() {
+            this.getList()
+        },
+        handleSizeChange(val) {
+            console.log(`每页 ${val} 条`)
+            this.pageSize = val
+            this.getList()
+        },
+        handleCurrentChange(val) {
+            this.currentPage = val
+            console.log(`当前页: ${val}`)
+            this.getList()
+        },
+    },
+}
+</script>
+<style lang="scss" scoped>
+.container {
+    background: #e8ecf6;
+}
+
+.center {
+    margin: 0 auto;
+    background: #ffffff;
+    // height: calc(100vh - 13vh);
+    border-radius: 4px;
+    padding: 20px 0;
+
+    /deep/.el-table td,
+    /deep/.el-table th {
+        text-align: center;
+    }
+}
+
+.row_top {
+    background: #f6f7fc;
+    border-radius: 4px;
+    margin-bottom: 10px;
+
+    .bg-left {
+        padding-left: 30px;
+    }
+
+    .title {
+        position: relative;
+    }
+
+    .title::before {
+        content: '';
+        display: inline-block;
+        width: 5px;
+        height: 30px;
+        background: #5473e8;
+        position: absolute;
+        left: 0;
+    }
+}
+
+.datascreen {
+    display: flex;
+    margin-left: 25px;
+    width: 35%;
+
+    .find {
+        margin-right: 10px;
+    }
+}
+
+.anniu {
+    display: flex;
+    width: 28%;
+}
+
+.fromdata {
+    overflow-y: scroll;
+    height: 560px;
+}
+
+.top_info {
+    margin: 10px 0 0 10px;
+    min-width: 712px;
+
+    .info_css {
+        margin-right: 20px;
+    }
+}
+.options_css {
+    margin: 0 5px;
+    width: 80%;
+}
+
+.findValue {
+    width: 100%;
+}
+
+/deep/.statusselect .el-input__inner {
+    color: #8890b1;
+    width: 100%;
+}
+
+.tanchuang {
+    margin: 0 auto;
+    text-align: center;
+}
+
+.tanchuang .el-info-table {
+    display: initial;
+}
+
+.tanchuang .el-info-table .el-form-item {
+    margin: 0 auto;
+    text-align: center;
+}
+
+.print-type {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    margin: auto;
+    width: 340px;
+    height: 160px;
+    background: white;
+    border-radius: 10px;
+    z-index: 999;
+
+    .bottom-btn {
+        text-align: center;
+        display: flex;
+    }
+}
+.text_css {
+    color: #5878e8;
+  }
+  
+.print-type-checkbox {
+    padding-left: 20px;
+    margin-top: 30px;
+
+    .el-date-editor.el-input {
+        width: 85% !important;
+    }
+
+    .proportion_css {
+        width: 85%;
+    }
+}
+
+.mask {
+    background: black;
+    width: 100vw;
+    height: 100vh;
+    position: fixed;
+    top: 0;
+    z-index: 99;
+    opacity: 0.3;
+}
+</style>

src/views/profitable/warehouseprofits.vue

@@ -183,9 +183,10 @@
        getPassYearFormatDate() {
         var nowDate = new Date()
         var _date = new Date()
-        var year = nowDate.getFullYear()
+        // nowDate.setTime(nowDate.getTime() - 24 * 60 * 60 * 1000 * 30)
+        var year = nowDate.getFullYear() - 1
         var year1 = _date.getFullYear()
-        var month = nowDate.getMonth()
+        var month = nowDate.getMonth() + 1
         var month1 = _date.getMonth() + 1
         var strDate = nowDate.getDate()
         var strDate1 = _date.getDate()

src/views/profitable/warehouseprofitsdetails.vue

@@ -107,10 +107,10 @@
       getPassYearFormatDate () {
           var nowDate = new Date()
           var _date = new Date()
-          // nowDate.setTime(nowDate.getTime()-24*60*60*1000*30)
+          nowDate.setTime(nowDate.getTime() - 24 * 60 * 60 * 1000 * 30)
           var year = nowDate.getFullYear()
           var year1 = _date.getFullYear()
-          var month = nowDate.getMonth()
+          var month = nowDate.getMonth() + 1
           var month1 = _date.getMonth() + 1
           var strDate = nowDate.getDate()
           var strDate1 = _date.getDate()

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -107,7 +107,7 @@
               <el-divider direction="vertical" v-if="scope.row.taskStatus == '待审核'"></el-divider>
             </span>
 
-            <span class="corles" @click="withdraw(scope.row)"  v-if="scope.row.approveStatus"
+            <span class="corles" @click="withdraw(scope.row)"  v-if="scope.row.approveStatus" v-show="scope.row.showFlag"
             >撤回</span>
             <!-- v-hasPermission="`warehouseManagement.warehouse.warehouseInfoTask.View`" -->
               <!-- v-hasPermission="`warehouseManagement.warehouse.warehouseInfoTask.audit`" -->
@@ -211,6 +211,7 @@
         primary: '1',
         pageSize: 10,
         searchType: '',
+        showFlag: false,
         publishertext:'全部发布者',
         publisher:'',
         searchTypeText: '全部状态',
@@ -423,6 +424,9 @@
               }else{
                 response.records[i].show=false
               }
+              if (response.records[i].publisher == localStorage.getItem('ws-pf_staffName')) {
+                response.records[i].showFlag = true
+              }
               
             }
             this.gainList = response

src/views/warehousenew/warehousingOrder.vue

@@ -2031,6 +2031,7 @@ export default {
                 data[q].surplusWeight =(data[q].inWarehouseWeight - data[q].outWarehouseWeight + data[q].profitAndLoss).toFixed(3)
               }
               data[q].avgCost = Number(data[q].avgCost).toFixed(2)
+              data[q].amountMoney = Number(data[q].amountMoney).toFixed(4)
               console.log(response.records[i].warehouseType)
               data[q].select = false
               data[q].weightedit = false