修复中英文表字段对应， 修复期初库存修改时改变审核状态和单据状态问题，货位添加了删除功能

修复中英文表字段对应， 修复期初库存修改时改变审核状态和单据状态问题，货位添加了删除功能

src/api/WarehouseAdjust.js

@@ -86,12 +86,14 @@ export function locationlistByEff(query) {
 // 删除货位
 export function deletelocation(query, query2) {
   var params = new URLSearchParams()
-  params.append('locationIds', query) // 你要传给后台的参数值 key/value
+  if (query !== '' && query !== null && query !== undefined) {
+    params.append('locationId', query) // 你要传给后台的参数值 key/value
+  }
   if (query2 !== '' && query2 !== null && query2 !== undefined) {
     params.append('operatorId', query2) // 你要传给后台的参数值 key/value
   }
   return request({
-    url: '/location/deletelocation',
+    url: '/location/deleteonelocation',
     method: 'post',
     data: params
   })

src/lang/en.js

@@ -313,6 +313,9 @@ export default {
     Coupon: 'voucher',
     AddCoupon: 'new voucher',
     CouponList: 'voucher list',
+    CouponProvideList: '优惠发放记录',
+    CouponUseList: '优惠券使用记录',
+    AddCouponProvide: '优惠券发放',
     Package: 'package',
     AddPackage: 'new package',
     PackageList: 'package list',
@@ -382,12 +385,21 @@ export default {
     installmentAnalyze: 'installment receivable  analysis',
     Voucher: '凭证管理',
     Newvoucher: '新建凭证',
+    Newvoucher2: '新建凭证',
     Voucherlist: '凭证列表',
     AccessComponent: '维修零件领用单',
     AccessComponentlist: 'claim list',
     AddAccessComponent: 'parts claim form',
     AccountBalance: '科目余额表',
     AccountBalance2: '科目余额表',
+    Verification: '核销单',
+    AddVerification: '新建核销单',
+    VerificationList: '核销单列表',
+    Memorandum: '备忘录',
+    AddMemorandum: '新建备忘录',
+    MemorandumList: '备忘录列表',
+    collectAndPay: '收付款汇总',
+    collectAndPayDetail: '收付款明细',
     NewAccessoriesOut: 'Spare parts sales from',
     AccountManagement: '账户管理',
     AccountManagement2: '账户管理',
@@ -459,6 +471,11 @@ export default {
   },
   saleBillList: {
     actualMoney: '实际销售金额',
+    freeMoney: '质保金额',
+    serviceMoney: '非质保金额',
+    freeQuantity: '质保数量',
+    serviceQuantity: '非质保数量',
+    repair: '维修',
     saleType: 'sales mode',
     repositoryName: 'warehouse name',
     productCode: 'product ID coding',
@@ -472,7 +489,9 @@ export default {
     total: 'amount',
     costMoney: 'cost',
     grossProfit: 'gross profit',
-    grossProfitRate: 'gross profit rate'
+    grossProfitRate: 'gross profit rate',
+    quantity: '数量',
+    color: '颜色'
   },
   shouldPayCount: {
     supplierId: 'supplier ID coding',
@@ -987,6 +1006,8 @@ export default {
     middlename: 'middle name',
     lastname: 'last name',
     phone: 'mobile no.',
+    phone12: '客户电话2',
+    phone13: '客户电话3',
     gender: 'gender',
     countryid: 'country',
     provinceid: 'province',
@@ -1063,6 +1084,7 @@ export default {
     supplierGroup: 'new grouping',
     createTime: 'profiling date',
     countyrId: 'edit country',
+    provinceId: '修改省',
     cityId: 'edit city',
     groupName: 'group name',
     createId: 'flier',
@@ -1450,6 +1472,7 @@ export default {
     storageMoveDate: 'Stock out date'
   },
   StockAlarm: {
+    color: '颜色',
     searchRepositoryId: 'warehouse',
     code: 'product coding',
     productName: 'product name',
@@ -1461,7 +1484,8 @@ export default {
     upStock: 'maximum stocks',
     onStock: 'current stocks',
     safeStock: 'safety stocks',
-    flag: 'alarm type'
+    flag: 'alarm type',
+    salePrice: '销售价格'
   },
   BuildUp: {
     title: 'assemble form subject',
@@ -1888,6 +1912,7 @@ export default {
     summary: 'Summary'
   },
   Invoice: {
+    fph: '发票号',
     sourceType: 'business form type',
     sourceNumber: 'business form  no.',
     invoiceNumber: 'invoice no.',
@@ -2051,7 +2076,8 @@ export default {
     heji10: 'freebies amount',
     heji11: 'other expenses',
     profit: 'profit',
-    ProfitMargin: 'profit rate'
+    ProfitMargin: 'profit rate',
+    invoiceNumber: '发票号'
   },
   SaleOrder: {
     title: 'subject',
@@ -2356,6 +2382,7 @@ export default {
     salecontrat: 'Sales contract'
   },
   InstallmentList: {
+    color: '颜色',
     isChange: 'change terms',
     afterCount: 'changed',
     afterRate: 'interest rate after change terms',
@@ -2482,6 +2509,7 @@ export default {
     receiptAccount: 'account name',
     receiptAccountNumber: 'account no.',
     receiptPersonId: 'collector',
+    receiptRepositoryId: '收款门店',
     receiptDate: 'collection date',
     totalLackMoney: 'balance',
     remark: 'remarks',
@@ -2616,6 +2644,7 @@ export default {
     iseffective: 'enabled status'
   },
   public: {
+    plgx: '更新',
     detail: 'detail',
     businessStatus: 'order status',
     rate: 'exchange rate',
@@ -2680,6 +2709,7 @@ export default {
     repositoryId: 'warehouse/branch'
   },
   repair: {
+    // 线下任务
     Redispatch: 'ReDispatch',
     yfpug: 'assigned',
     ygyjs: 'accepted',
@@ -2995,6 +3025,8 @@ export default {
     evaluation: 'evaluation'
   },
   Hmodule: {
+    hhd: '换货单',
+    ggxh: '规格型号',
     cilent: 'click to upload',
     cancel: 'cancel',
     sure: 'confirm',
@@ -3061,8 +3093,10 @@ export default {
   },
   updates: {
     gz: 'trace',
+    wly: '无来源',
     ckmx: 'Out of stock detail',
     shmx: 'recovery detail',
+    sncode: 'sn编码',
     zxsyj: 'total sales amount',
     zhzye: 'total account balance',
     byszc: 'this month payment balance',
@@ -3606,6 +3640,7 @@ export default {
     wlly: 'material source',
     roleid: 'role',
 
+    // 新加的 新加的 新加的
     kssj: 'start time',
     jssj: 'end time',
     scsl: 'production qty.',
@@ -3841,6 +3876,15 @@ export default {
     pj: 'accessories',
     jgj: 'fastener',
     dc: 'battery',
+    djylfj: '点击预览下载附件',
+    fph: '发票号',
+    bcskje: '本次预收金额',
+    yskdk: '预收款抵扣',
+    buyIntention: '购买意向',
+    spmx: '商品明细',
+    bsckmx: '报损出库明细',
+    bsrkmx: '报损入库明细',
+    rksl: '入库数量',
     newvoucher: '凭证',
     md: 'branch',
     qy: 'area',
@@ -3903,5 +3947,67 @@ export default {
     asds: 'co-maker info.',
     oijn: 'collection',
     pkj: 'follow up'
+  },
+  Verification: {
+    jbr: '经办人',
+    hxrq: '核销日期',
+    qqq: '应结算金额',
+    www: '已结算金额',
+    eee: '核销金额'
+  },
+  MemorandumList: {
+    time: '提醒时间',
+    content: '提醒内容',
+    per: '提醒人',
+    stat: '状态',
+    createTime: '创建时间'
+  },
+  collectAndPay: {
+    time: '时间',
+    saleOut: '销售出库',
+    stockRetreat: '采购退货',
+    collectMoney: '收款',
+    income: '收入',
+    repaireOut: '维修出库',
+    advanceCollect: '预收',
+    totalCollect: '收款合计',
+    saleReturn: '销售退货',
+    payment: '付款单',
+    outlay: '支出单',
+    totalPay: '总支出',
+    balance: '余额',
+    payModeName: '结算方式',
+    type: '优惠券类型',
+    effectiveTime: '有效期',
+    effectiveType: '适用类别',
+    isRepeat: '是否可以叠加',
+    number: '发行量',
+    send: '已发放数量',
+    left: '剩余数量',
+    usedNumber: '已使用数量',
+    couponName: '优惠券名称',
+    repositoryName: '门店名称',
+    couponNumber: '优惠券码',
+    customerName: '客户姓名',
+    useDate: '使用时间',
+    actualUseMoney: '实际抵扣金额',
+    leftMoney: '剩余金额',
+    number2: '数量',
+    ffxx: '发放信息',
+    couponNumbers: '优惠券码',
+    couponSupport2: '优惠劵抵用金额',
+    couponSupportOld: '旧优惠劵抵用金额'
+  },
+  collectAndPayDetail: {
+    name: '名称',
+    sl: '回收数量',
+    cgck: '采购仓库',
+    fjf: '附加费',
+    cbj: '成本价',
+    fx: '方向',
+    transferReceipt: '门店收到公司转账',
+    transferExpense: '门店转给公司',
+    lrqcsj: '录入期初数据',
+    ygssmdm: '员工所属门店'
   }
 }

src/lang/zh.js

@@ -1520,7 +1520,6 @@ export default {
     heji2: '调整金额合计'
   },
   MaterialsList: {
-
     bomNumber: 'BOM编码',
     parentBomNumber: '上级BOM',
     bomTypeId: 'BOM类型',

src/views/Product/ProductList.vue

@@ -41,16 +41,16 @@
     </el-card>
     <el-card class="box-card" style="margin-top: 10px" shadow="never">
       <!-- 批量操作 -->
-      <el-dropdown @command="handleCommand">
+      <!-- <el-dropdown @command="handleCommand">
         <el-button v-waves class="filter-item" style="margin-left: 0" type="primary">
           {{ $t('public.batchoperation') }} <i class="el-icon-arrow-down el-icon--right"/>
         </el-button>
         <el-dropdown-menu slot="dropdown" style="width: 140px">
           <el-dropdown-item v-permission="['1-31-33-14']" style="text-align: left" command="up" ><svg-icon icon-class="上架" style="width: 40px"/>{{ $t('public.up') }}</el-dropdown-item>
-          <el-dropdown-item v-permission="['1-31-33-15']" style="text-align: left" command="down"><svg-icon icon-class="下架" style="width: 40px"/>{{ $t('public.down') }}</el-dropdown-item>
-          <!--          <el-dropdown-item v-permission="['1-31-33-2']" style="text-align: left" command="delete"><svg-icon icon-class="shanchu" style="width: 40px"/>{{ $t('public.delete') }}</el-dropdown-item>-->
-        </el-dropdown-menu>
-      </el-dropdown>
+          <el-dropdown-item v-permission="['1-31-33-15']" style="text-align: left" command="down"><svg-icon icon-class="下架" style="width: 40px"/>{{ $t('public.down') }}</el-dropdown-item> -->
+      <!--          <el-dropdown-item v-permission="['1-31-33-2']" style="text-align: left" command="delete"><svg-icon icon-class="shanchu" style="width: 40px"/>{{ $t('public.delete') }}</el-dropdown-item>-->
+      <!-- </el-dropdown-menu>
+      </el-dropdown> -->
       <!-- 表格导出操作 -->
       <el-button v-permission="['1-31-33-6']" v-waves :loading="downloadLoading" class="filter-item" style="width: 86px" @click="handleExport"> <svg-icon icon-class="daochu"/>{{ $t('public.export') }}</el-button>
 

src/views/StockOut/OtherStockOutList.vue

@@ -237,7 +237,7 @@ export default {
     },
     // 清空搜索仓库选择
     clearFilter() {
-      this.getemplist.repositoryId = ''
+      this.getemplist.repositoryId = this.$store.getters.repositoryId
       this.repositoryId = ''
     },
     repositoryname(val) {

src/views/WarehouseAdjust/Locationlist.vue

@@ -91,7 +91,7 @@
             <el-button v-permission="['1-9-169-8']" v-show="scope.row.isEffective === 2" style="margin-left: 18px;" title="启用" type="primary" size="mini" icon="el-icon-check" circle @click="open(scope.row)"/>
             <el-button v-permission="['1-9-169-9']" v-show="scope.row.isEffective === 1" title="停用" type="primary" size="mini" icon="el-icon-close" circle @click="close(scope.row)"/>
             <el-button v-permission="['1-9-169-3']" type="primary" size="mini" @click="handleEdit(scope.row)">{{ $t('public.edit') }}</el-button>
-            <!-- <el-button v-permission="['1-9-169-2']" size="mini" type="danger" @click="handleDelete(scope.row)">{{ $t('public.delete') }}</el-button> -->
+            <el-button v-permission="['1-9-169-2']" size="mini" type="danger" @click="handleDelete(scope.row)">{{ $t('public.delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>

src/views/WarehouseAdjust/components/MyDialog.vue

@@ -284,6 +284,10 @@ export default {
     // 修改和取消按钮
     // 修改按钮
     handleEditok() {
+      delete this.personalForm.judgeStat
+      delete this.personalForm.receiptStat
+      delete this.personalForm.approvalUseVos
+      delete this.personalForm.initialEnterDetailVos
       this.personalForm.repositoryId = this.$store.getters.repositoryId
       this.personalForm.regionId = this.$store.getters.regionId
       this.personalForm.createPersonId = this.$store.getters.userId