Browse Source

前端sdy

zhongtianhaoyuan 4 years ago
parent
commit
ecb0e36fd3

+ 5 - 2
src/lang/zh.js

@@ -499,6 +499,8 @@
     warehouseManagementDelete:'仓库管理删除',
     warehouseManagementIoss:'仓库管理盘损',
     warehouseManagementRecord:'记录',
+    warehouseManagementNoComplete:'待完成',
+
 
     // 采购模块
     procurement: '采购管理',
@@ -4664,9 +4666,9 @@
     monthlyReport: '月报',
     customTime: '自定义时间'
   },
-  // 合同管理
+  //合同管理
   sales: {
-    salesContract: '销售合同',
+     salesContract: '销售合同',
     salesContractEdit: '销售合同编辑',
     salesContractExamine: '销售合同查看',
     purchaseContractExamine: '采购合同查看',
@@ -4690,6 +4692,7 @@
     warehouseManagementIoss:'仓库管理盘损',
     warehouseManagementIossRecord:'盘损详情',
     warehouseManagementRecord:'记录',
+    warehouseManagementNoComplete:'待完成',
 
   },
   // 年度培训

+ 18 - 0
src/views/warehouse/component/router/index.js

@@ -164,6 +164,24 @@ const warehouseManagementRouter = {
       },
       hidden: true
     },
+
+    {
+      path: 'warehouseManagementNoComplete',
+            
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/warehouse/warehouseManagementNoComplete'),
+      name: 'warehouseManagementNoComplete',
+      meta: {
+        title: 'warehouseManagementNoComplete',
+        shortcutEntrance: 'warehouseManagementNoComplete',
+        module: 'warehouse.warehouseManagementNoComplete',
+
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden: true
+    },
   ],
 };
 export default warehouseManagementRouter;

+ 61 - 78
src/views/warehouse/warehouseManagementList.vue

@@ -35,22 +35,6 @@
           "
           >删除</ws-button
         >
-        <!-- <ws-button
-          type="primary"
-          @click="handlePut()"
-          v-hasPermission="
-            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-          "
-          >入库</ws-button
-        >
-        <ws-button
-          type="primary"
-          @click="handleDelivery()"
-          v-hasPermission="
-            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-          "
-          >出库</ws-button
-        > -->
       </template>
       <template slot="right">
         <ws-input
@@ -94,63 +78,63 @@
         </el-table-column>
         <el-table-column prop="goodsName" label="仓库编号" width="80">
         </el-table-column>
-        <el-table-column prop="weight" label="容量(吨)"> 
-        </el-table-column>
+        <el-table-column prop="weight" label="容量(吨)"> </el-table-column>
         <el-table-column prop="unitContractPrice" label="入库量(吨)">
         </el-table-column>
         <el-table-column prop="packingMethod" label="出库量(吨)">
         </el-table-column>
-        <el-table-column prop="buyer" label="应余量(吨)">
-        </el-table-column>
+        <el-table-column prop="buyer" label="应余量(吨)"> </el-table-column>
         <el-table-column prop="seller" label="出入库" width="160">
-           <button
-              type="primary"
-              @click="staywarehousing()"
-              v-hasPermission="
-                `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-              "
-              >待完成</button
-            > <button
-              type="primary"
-              @click="delivery()"
-              v-hasPermission="
-                `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-              "
-              >出库</button
-            >
-             <button
-              type="primary"
-              @click="warehousing()"
-              v-hasPermission="
-                `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-              "
-              >入库</button
-            >
-          
-           </el-table-column>
+          <button
+            type="primary"
+            @click="nocomplete()"
+            v-hasPermission="
+              `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+            "
+          >
+            待完成
+          </button>
+          <button
+            type="primary"
+            @click="delivery()"
+            v-hasPermission="
+              `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+            "
+          >
+            出库
+          </button>
+          <button
+            type="primary"
+            @click="warehousing()"
+            v-hasPermission="
+              `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+            "
+          >
+            入库
+          </button>
+        </el-table-column>
         <el-table-column prop="address" label="操作" width="200">
           <!-- <template slot-scope="scope"> -->
-            <ws-button
-              type="primary"
-              @click="record()"
-              v-hasPermission="
-                `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-              "
-              >记录</ws-button
-            >
+          <ws-button
+            type="primary"
+            @click="record()"
+            v-hasPermission="
+              `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+            "
+            >记录</ws-button
+          >
 
-            <ws-button
-              type="primary"
-              @click="loss()"
-              v-hasPermission="
-                `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-              "
-              >盘损</ws-button
-            >
+          <ws-button
+            type="primary"
+            @click="loss()"
+            v-hasPermission="
+              `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+            "
+            >盘损</ws-button
+          >
           <!-- </template> -->
         </el-table-column>
       </el-table>
-      
     </div>
   </div>
 </template>
@@ -196,8 +180,8 @@ export default {
       currentPage: 1,
       pageSize: 10,
       searchType: 1,
-       searchTypeText: '未完成',
-       searchKeyWord: '',
+      searchTypeText: '未完成',
+      searchKeyWord: '',
       contractType: 2,
       startDate: null,
       endDate: null,
@@ -230,28 +214,28 @@ export default {
   },
   methods: {
     //出库
-    delivery(){
-          this.$router.push({ path: 'warehouseManagementDelivery' })
+    delivery() {
+      this.$router.push({ path: 'warehouseManagementDelivery' })
     },
     //入库
-    warehousing(){
-         this.$router.push({ path: 'warehouseManagementPut' })
+    warehousing() {
+      this.$router.push({ path: 'warehouseManagementPut' })
     },
-    //待入库
-    staywarehousing(){
-
+    //待完成
+    nocomplete() {
+      this.$router.push({ path: 'warehouseManagementNoComplete' })
     },
     //记录
-    record(){
-      this.$router.push({path:'warehouseManagementRecord'})
+    record() {
+      this.$router.push({ path: 'warehouseManagementRecord' })
     },
     //盘损
-    loss(){
-        this.$router.push({ path: 'warehouseManagementIoss' })
+    loss() {
+      this.$router.push({ path: 'warehouseManagementIoss' })
     },
     //查看
     handleLook() {
-       this.$router.push({ path: 'warehouseManagementLook' })
+      this.$router.push({ path: 'warehouseManagementLook' })
     },
     //添加
     handleAdd() {
@@ -262,7 +246,7 @@ export default {
       this.$router.push({ path: 'warehouseManagementEdit' })
     },
     handleDelete() {
-       this.$router.push({ path: 'warehouseManagementDelete' })
+      this.$router.push({ path: 'warehouseManagementDelete' })
     },
     dateFormat(fmt, date) {
       let ret
@@ -439,5 +423,4 @@ export default {
   width: 62px;
   text-align: right;
 }
-
 </style>

+ 329 - 0
src/views/warehouse/warehouseManagementNoComplete.vue

@@ -0,0 +1,329 @@
+<template>
+  <div class="container">
+    <el-row>
+      <el-col :span="20">
+        <h2 class="bg-left title">待完成记录</h2>
+      </el-col>
+      <el-col :span="4" class="bg-right">
+        <el-button
+          class="bg-bottom"
+          type="primary"
+          size="small"
+          @click="returnWarehouse"
+          >返回</el-button
+        >
+      </el-col>
+    </el-row>
+    <div class="center">
+      <h2>鲅鱼圈一号库 102仓位(容量100吨)</h2>
+      <ws-form ref="deptBudgetList" :model="deptBudgetList">
+        <el-table>
+          <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="contractNo" label="货名"> </el-table-column>
+          <el-table-column prop="goodsName" label="毛重(吨)"></el-table-column>
+          <el-table-column prop="weight" label="皮重(吨)"> </el-table-column>
+          <el-table-column prop="unitContractPrice" label="净重(吨)"></el-table-column>   
+          <el-table-column prop="packingMethod" label="品级"> </el-table-column>
+          <el-table-column prop="buyer" label="出入库日期"> </el-table-column>
+          <el-table-column prop="buyer" label="类型"> </el-table-column>
+          <el-table-column prop="buyer" label="合同编号"> </el-table-column>
+          <el-table-column prop="buyer" label="车牌号"> </el-table-column>
+          <el-table-column prop="buyer" label="经办人"> </el-table-column>
+          <el-table-column prop="buyer" label="内勤"> </el-table-column>
+          <el-table-column prop="buyer" label="保存时间"> </el-table-column>
+          <el-table-column prop="address" label="操作" width="200">
+          <ws-button
+            type="primary"
+            @click="edits()"
+            v-hasPermission="
+              `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+            "
+            >编辑</ws-button
+          >
+          <ws-button
+            type="primary"
+            @click="deletes()"
+            v-hasPermission="
+              `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+            "
+            >删除</ws-button
+          >
+          <!-- </template> -->
+        </el-table-column>
+        </el-table>
+        <div style="text-align: right; padding: 10px">
+          <el-button
+            class="bg-bottom-up"
+            type="primary"
+            size="small"
+            @click="returnWarehouse()"
+            >关闭</el-button
+          >
+        </div>
+      </ws-form>
+    </div>
+  </div>
+</template>
+<script>
+import {
+  getList,
+  export1,
+  editstatus,
+  billoperatehis,
+} from '@/model/contarct/index'
+import { downloadFile } from '@/utils/batchDown'
+import Pagination from '@/components/Pagination'
+import WsUpload from '@/components/WsUpload'
+import { dayjs, fmoney, EventBus } from 'base-core-lib'
+export default {
+  name: 'viewSpareMoney',
+  components: {
+    WsUpload,
+    Pagination,
+  },
+  watch: {
+    vesselId(val) {
+      this.getList()
+    },
+    isShow(val) {
+      this.showType = val
+    },
+  },
+  data() {
+    return {
+      //弹出框
+      dialogViewSpareMoney: false,
+      dialogApproveFormVisible: false,
+      // 船舶类型
+      monetaryKey: null,
+      // 表格显示数据
+      tableDate: [],
+      // 是否显示
+      showType: true,
+      // 年
+      year: '',
+      deptBudgetTotal: 0,
+      currentPage: 1,
+      pageSize: 10,
+      searchType: 1,
+      searchKeyWord: '',
+      contractType: 2,
+      startDate: null,
+      endDate: null,
+      // 提交类型
+      submitType: true,
+      selectpackingMethod: {},
+      size: 10,
+      compId: sessionStorage.getItem('ws-pf_compId'),
+      deptCircularPage: {},
+      packtypeList: {},
+      date: {
+        year: dayjs().format('YYYY'),
+        month: dayjs().format('MM'),
+      },
+      contractList: [],
+      deptBudgetList: {},
+      historyList: [],
+
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          return time.getTime() > Date.now()
+        },
+      },
+      accessoryTFs: false,
+    }
+  },
+  activated() {
+    //cg.viewBudget
+    //cg.viewSpareMoney
+    // this.getVesselData();
+    this.getList()
+    this.showType = this.isShow
+  },
+  methods: {
+    //返回按钮
+    returnWarehouse() {
+      this.$router.push({ path: 'warehouseManagementList' })
+    },
+    //删除
+    deletes(){
+
+    },
+    //编辑
+    edits(){
+      this.$router.push({ path: 'warehouseManagementPerfectput' })
+    },
+    dateFormat(fmt, date) {
+      let ret
+      const opt = {
+        'Y+': date.getFullYear().toString(), // 年
+        'm+': (date.getMonth() + 1).toString(), // 月
+        'd+': date.getDate().toString(), // 日
+        'H+': date.getHours().toString(), // 时
+        // "M+": date.getMinutes().toString(),         // 分
+        // "S+": date.getSeconds().toString()          // 秒
+        // 有其他格式化字符需求可以继续添加,必须转化成字符串
+      }
+      for (let k in opt) {
+        ret = new RegExp('(' + k + ')').exec(fmt)
+        if (ret) {
+          fmt = fmt.replace(
+            ret[1],
+            ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
+          )
+        }
+      }
+      return fmt
+    },
+    handleClose() {
+      this.accessoryTFs = false
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
+    getList() {
+      getList({
+        compId: sessionStorage.getItem('ws-pf_compId'),
+        contractType: this.contractType,
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        searchType: this.searchType,
+        searchKeyWord: this.searchKeyWord,
+        startDate: this.startDate,
+        endDate: this.endDate,
+        contrPage: this.contrPage,
+      })
+        .toPromise()
+        .then((response) => {
+          for (var i = 0; i < response.records.length; i++) {
+            if (response.records[i].addressUrl != null) {
+              response.records[i].addressUrlArray = response.records[
+                i
+              ].addressUrl.split(',')
+            } else {
+              response.records[i].addressUrlArray = []
+            }
+          }
+          this.deptCircularPage.currentPage = response.current
+          this.deptCircularPage.pageSize = response.size
+          this.deptBudgetTotal = response.total
+          this.contractList = response
+        })
+    },
+    selecttaskType(e) {
+      for (var i = 0; i < this.taskTypeList.length; i++) {
+        if (this.taskTypeList[i].value == e) {
+          this.searchType = this.taskTypeList[i].type
+        }
+      }
+    },
+    fujian(row) {
+      if (
+        row.receiveAttachmentPath === null ||
+        row.receiveAttachmentPath === ''
+      ) {
+        EventBus.$emit(
+          'warning',
+          this.$t('system.noticeCircular.NoInformation')
+        )
+      } else {
+        this.accessoryTFs = true
+      }
+      this.appendixIdss = row.receiveAttachmentPath
+    },
+    handleExamine(row) {
+      this.$router.push({
+        name: 'salesContractExamine',
+        query: { id: row.id },
+      })
+    },
+
+    // 关闭 dialog时 处理文件url 初始化upload组件
+    handleCloe() {
+      this.dialogViewSpareMoney = false
+    },
+    history(row) {
+      console.log(row)
+      billoperatehis({ id: row.id })
+        .toPromise()
+        .then((response) => {
+          this.historyList = response
+        })
+    },
+    find() {
+      this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
+      this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
+      this.currentPage = 1
+      this.getList()
+    },
+    async exportlist() {
+      const { data } = await export1(
+        {
+          compId: sessionStorage.getItem('ws-pf_compId'),
+          contractType: this.contractType,
+          currentPage: this.currentPage,
+          pageSize: this.pageSize,
+          searchType: this.searchType,
+          searchKeyWord: this.searchKeyWord,
+          startDate: this.startDate,
+          endDate: this.endDate,
+        },
+        {},
+        { responseType: 'blob' }
+      ).toPromise()
+      downloadFile({
+        res: data,
+        fileName: `${
+          this.date.year + (this.date.month ? `-${this.date.month}` : '')
+        }_采购合同`,
+        type: 'xls',
+      })
+    },
+    // deletecontract(){},
+    //删除
+
+    approve() {},
+    listQuery() {},
+    total() {},
+    clearfiltQuery() {},
+    selectCrtDuty() {},
+  },
+}
+</script>
+<style lang="scss" scoped>
+.center {
+  position: relative;
+  top: 50px;
+  width: 90%;
+  height: 500px;
+  margin: 0 auto;
+}
+.container .bg-left {
+  margin-left: 40px;
+}
+.container .bg-bottom {
+  position: absolute;
+  float: right;
+  top: 15px;
+  right: 20px;
+}
+.vertical-text-left {
+  width: 62px;
+  text-align: right;
+}
+/deep/.el-form-item {
+  width: 33%;
+}
+</style>