Bladeren bron

Merge branch 'develop_12' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh12

chenrui 2 jaren geleden
bovenliggende
commit
b9d3b38031

+ 40 - 38
package-lock.json

@@ -14,13 +14,13 @@
     },
     "@ant-design/icons": {
       "version": "2.1.1",
-      "resolved": "https://registry.npm.taobao.org/@ant-design/icons/download/@ant-design/icons-2.1.1.tgz",
-      "integrity": "sha1-e5wI3/1PXUHbZn2dvl4BB9C9mko="
+      "resolved": "https://registry.npmjs.org/@ant-design/icons/-/icons-2.1.1.tgz",
+      "integrity": "sha512-jCH+k2Vjlno4YWl6g535nHR09PwCEmTBKAG6VqF+rhkrSPRLfgpU2maagwbZPLjaHuU5Jd1DFQ2KJpQuI6uG8w=="
     },
     "@ant-design/icons-vue": {
       "version": "2.0.0",
-      "resolved": "https://registry.npm.taobao.org/@ant-design/icons-vue/download/@ant-design/icons-vue-2.0.0.tgz",
-      "integrity": "sha1-A1f1AQpATp80qHpLQbKgjfaR284=",
+      "resolved": "https://registry.npmjs.org/@ant-design/icons-vue/-/icons-vue-2.0.0.tgz",
+      "integrity": "sha512-2c0QQE5hL4N48k5NkPG5sdpMl9YnvyNhf0U7YkdZYDlLnspoRU7vIA0UK9eHBs6OpFLcJB6o8eJrIl2ajBskPg==",
       "requires": {
         "@ant-design/colors": "^3.1.0",
         "babel-runtime": "^6.26.0"
@@ -1202,9 +1202,9 @@
       },
       "dependencies": {
         "core-js": {
-          "version": "3.15.2",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.15.2.tgz",
-          "integrity": "sha512-tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q=="
+          "version": "3.27.2",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.27.2.tgz",
+          "integrity": "sha512-9ashVQskuh5AZEZ1JdQWp1GqSoC1e1G87MzRqg2gIfVAQ7Qn9K+uFj8EcniUFA4P2NLZfV+TOlX1SzoKfo+s7w=="
         }
       }
     },
@@ -2486,9 +2486,9 @@
       "dev": true
     },
     "ant-design-vue": {
-      "version": "1.7.6",
-      "resolved": "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-1.7.6.tgz",
-      "integrity": "sha512-EOS6g/deT53xHxZDMOxedyBehXSNMGnxdOeQtDksmiRvCBrZs+yoFYoVOe9pmQ8EJ7XQLn8TMReiYbXi78kppA==",
+      "version": "1.7.8",
+      "resolved": "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-1.7.8.tgz",
+      "integrity": "sha512-F1hmiS9vwbyfuFvlamdW5l9bHKqRlj9wHaGDIE41NZMWXyWy8qL0UFa/+I0Wl8gQWZCqODW5pN6Yfoyn85At3A==",
       "requires": {
         "@ant-design/icons": "^2.1.1",
         "@ant-design/icons-vue": "^2.0.0",
@@ -3926,9 +3926,9 @@
       }
     },
     "classnames": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz",
-      "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz",
+      "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw=="
     },
     "clean-css": {
       "version": "4.2.1",
@@ -4307,7 +4307,7 @@
     "component-classes": {
       "version": "1.2.6",
       "resolved": "https://registry.npmjs.org/component-classes/-/component-classes-1.2.6.tgz",
-      "integrity": "sha1-xkI5TDYYpNiwuJGe/Mu9kw5c1pE=",
+      "integrity": "sha512-hPFGULxdwugu1QWW3SvVOCUHLzO34+a2J6Wqy0c5ASQkfi9/8nZcBB0ZohaEbXOQlCflMAEMmEWk7u7BVs4koA==",
       "requires": {
         "component-indexof": "0.0.3"
       }
@@ -4321,7 +4321,7 @@
     "component-indexof": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/component-indexof/-/component-indexof-0.0.3.tgz",
-      "integrity": "sha1-EdCRMSI5648yyPJa6csAL/6NPCQ="
+      "integrity": "sha512-puDQKvx/64HZXb4hBwIcvQLaLgux8o1CbWl39s41hrIIZDl1lJiD5jc22gj3RBeGK0ovxALDYpIbyjqDUUl0rw=="
     },
     "compressible": {
       "version": "2.0.17",
@@ -5607,14 +5607,14 @@
       }
     },
     "dom-align": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/dom-align/-/dom-align-1.12.2.tgz",
-      "integrity": "sha512-pHuazgqrsTFrGU2WLDdXxCFabkdQDx72ddkraZNih1KsMcN5qsRSTR9O4VJRlwTPCPb5COYg3LOfiMHHcPInHg=="
+      "version": "1.12.4",
+      "resolved": "https://registry.npmjs.org/dom-align/-/dom-align-1.12.4.tgz",
+      "integrity": "sha512-R8LUSEay/68zE5c8/3BDxiTEvgb4xZTF0RKmAHfiEVN3klfIpXfi2/QCoiWPccVQ0J/ZGdz9OjzL4uJEP/MRAw=="
     },
     "dom-closest": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/dom-closest/-/dom-closest-0.2.0.tgz",
-      "integrity": "sha1-69n5HRvyLo1vR3h2u80+yQIWwM8=",
+      "integrity": "sha512-6neTn1BtJlTSt+XSISXpnOsF1uni1CHsP/tmzZMGWxasYFHsBOqrHPnzmneqEgKhpagnfnfSfbvRRW0xFsBHAA==",
       "requires": {
         "dom-matches": ">=1.0.1"
       }
@@ -5637,7 +5637,7 @@
     "dom-matches": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/dom-matches/-/dom-matches-2.0.0.tgz",
-      "integrity": "sha1-0nKLQWqHUzmA6wibhI0lPPI6dYw="
+      "integrity": "sha512-2VI856xEDCLXi19W+4BechR5/oIS6bKCKqcf16GR8Pg7dGLJ/eBOWVbCmQx2ISvYH6wTNx5Ef7JTOw1dRGRx6A=="
     },
     "dom-scroll-into-view": {
       "version": "2.0.1",
@@ -8457,7 +8457,7 @@
     "intersperse": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/intersperse/-/intersperse-1.0.0.tgz",
-      "integrity": "sha1-8lYfsc/vn1J3zDNHoiiGtDUaUYE="
+      "integrity": "sha512-LGcfug7OTeWkaQ8PEq8XbTy9Jl6uCNg8DrPnQUmwxSY8UETj1Y+LLmpdD0qHdEj6KVchuH3BE3ZzIXQ1t3oFUw=="
     },
     "invariant": {
       "version": "2.2.4",
@@ -8663,9 +8663,9 @@
       "integrity": "sha512-wW/SXnYJkTjs++tVK5b6kVITZpAZPtUrt9SF80vvxGiF/Oywal+COk1jlRkiVq15RFNEQKQY31TkV24/1T5cVg=="
     },
     "is-negative-zero": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
-      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w=="
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="
     },
     "is-number": {
       "version": "3.0.0",
@@ -10643,7 +10643,7 @@
     "json2mq": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/json2mq/-/json2mq-0.2.0.tgz",
-      "integrity": "sha1-tje9O6nqvhIsg+lyBIOusQ0skEo=",
+      "integrity": "sha512-SzoRg7ux5DWTII9J2qkrZrqV1gt+rTaoufMxEzXbS26Uid0NwaJd123HcoB80TgubEppxxIGdNxCx50fEoEWQA==",
       "requires": {
         "string-convert": "^0.2.0"
       }
@@ -11005,11 +11005,6 @@
       "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
       "dev": true
     },
-    "lodash.toarray": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz",
-      "integrity": "sha1-JMS/zWsvuji/0FlNsRedjptlZWE="
-    },
     "lodash.transform": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.transform/-/lodash.transform-4.6.0.tgz",
@@ -11628,9 +11623,9 @@
       }
     },
     "nanopop": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/nanopop/-/nanopop-2.1.0.tgz",
-      "integrity": "sha512-jGTwpFRexSH+fxappnGQtN9dspgE2ipa1aOjtR24igG0pv6JCxImIAmrLRHX+zUF5+1wtsFVbKyfP51kIGAVNw=="
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/nanopop/-/nanopop-2.2.0.tgz",
+      "integrity": "sha512-E9JaHcxh3ere8/BEZHAcnuD10RluTSPyTToBvoFWS9/7DcCx6gyKjbn7M7Bx7E1veCxCuY1iO6h4+gdAf1j73Q=="
     },
     "natural-compare": {
       "version": "1.4.0",
@@ -11676,11 +11671,18 @@
       }
     },
     "node-emoji": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npm.taobao.org/node-emoji/download/node-emoji-1.10.0.tgz",
-      "integrity": "sha1-iIar0l2ce7YYAqZYUj0fjSqJsto=",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz",
+      "integrity": "sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==",
       "requires": {
-        "lodash.toarray": "^4.4.0"
+        "lodash": "^4.17.21"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+        }
       }
     },
     "node-fetch": {
@@ -15087,7 +15089,7 @@
     "string-convert": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/string-convert/-/string-convert-0.2.1.tgz",
-      "integrity": "sha1-aYLMMEn7tM2F+LJFaLnZvznu/5c="
+      "integrity": "sha512-u/1tdPl4yQnPBjnVrmdLo9gtuLvELKsAoRapekWggdiQNvvvum+jYF329d84NAa660KQw7pB2n36KrIKVoXa3A=="
     },
     "string-length": {
       "version": "2.0.0",

+ 1 - 1
package.json

@@ -15,7 +15,7 @@
     "postinstall": "opencollective-postinstall"
   },
   "dependencies": {
-    "ant-design-vue": "^1.7.1",
+    "ant-design-vue": "^1.7.8",
     "axios": "^0.19.0",
     "core-js": "2.6.9",
     "echarts": "^4.9.0",

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1675215052114
+  "version": 1675241779308
 }

+ 10 - 1
src/api/purchaseReturn.js

@@ -183,4 +183,13 @@ export const purchaseReturnPurchaseBillNoSyncList = (params) => {
     data: params,
     method: 'post'
   })
-}
+}
+
+// 采购退货报表-供应商列表
+export const queryReturnSupplierList = (params) => {
+  return axios({
+    url: '/purchaseTarget/queryReturnSupplierList',
+    data: params,
+    method: 'post'
+  })
+}

+ 5 - 5
src/config/router.config.js

@@ -17,7 +17,7 @@ export const asyncRouterMap = [
     children: [
       {
         path: '/home',
-        name: 'home',
+        name: 'homePage',
         redirect: '/home',
         component: PageView,
         meta: {
@@ -40,7 +40,7 @@ export const asyncRouterMap = [
             children: [
               {
                 path: '/home',
-                name: 'home',
+                name: 'homeIndex',
                 component: () => import(/* webpackChunkName: "home" */ '@/views/Home'),
                 meta: {
                   title: '首页',
@@ -2061,8 +2061,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '急件冲减报表',
-              icon: 'profile'
-              // permission: 'M_urgentItemsOffsetReportList'
+              icon: 'profile',
+              permission: 'M_urgentItemsOffsetReportList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -2834,7 +2834,7 @@ export const asyncRouterMap = [
           {
             path: '/productManagement/newProductList',
             redirect: '/newProduct/list/:onlineFalg',
-            name: 'newProductList',
+            name: 'newProduct',
             component: BlankLayout,
             meta: {
               title: '产品信息',

+ 1 - 1
src/views/common/productBrand.js

@@ -17,7 +17,7 @@ const ProductBrand = {
   props: {
     value: {
       type: String,
-      default: ''
+      default: undefined
     },
     id: {
       type: String,

+ 1 - 2
src/views/common/shelfList.js

@@ -19,8 +19,7 @@ const shelfSList = {
     `,
   props: {
     value: {
-      type: [String, Array],
-      default: ''
+      type: [String, Array, Object],
     },
     id: {
       type: String,

+ 6 - 1
src/views/common/warehouse.js

@@ -3,6 +3,7 @@ const Warehouse = {
   template: `
         <a-cascader
           :size="size"
+          :changeOnSelect="changeOnSelect"
           @change="handleChange"
           :value="defaultVal"
           expand-trigger="hover"
@@ -31,7 +32,11 @@ const Warehouse = {
     size: {
       type: String,
       default: 'default'
-    }
+    },
+    changeOnSelect:{
+      type: Boolean,
+      default: false
+    },
   },
   data () {
     return {

+ 17 - 3
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -32,7 +32,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="仓库仓位">
-                <Warehouse id="inventoryQueryList-warehouse" ref="warehouse" v-model="queryParam.warehouse"></Warehouse>
+                <Warehouse id="inventoryQueryList-warehouse" :changeOnSelect="true" ref="warehouse" v-model="queryParam.warehouse"></Warehouse>
               </a-form-model-item>
             </a-col>
             <template v-if="advanced">
@@ -188,7 +188,9 @@ export default {
         productTypeSn1: '', //  产品分类1
         productTypeSn2: '', //  产品分类2
         productTypeSn3: '', //  产品分类3
-        warehouse: undefined,
+        warehouse: [],
+        warehouseSn: '',
+        warehouseLocationSn:'',
         zeroQtyFlag: false, //  库存情况
         enableFlag: true, // 显示禁用产品
         minUnsalableDays: undefined, // 滞销天数最小值
@@ -228,6 +230,11 @@ export default {
           params.product = {
             sysFlag: params.productSysFlag || undefined
           }
+          
+          // 仓库仓位
+          params.warehouseSn = params.warehouse[0]
+          params.warehouseLocationSn = params.warehouse[1]
+          
           return stockList(params).then(res => {
             let data
             if (res.status == 200) {
@@ -341,7 +348,9 @@ export default {
       this.queryParam.brandName = undefined
       this.queryParam.productTypeName = undefined
       this.queryParam.zeroQtyFlag = false
-      this.queryParam.warehouse = undefined
+      this.queryParam.warehouse = []
+      this.queryParam.warehouseSn =  ''
+      this.queryParam.warehouseLocationSn = ''
       this.$refs.warehouse.setDefaultVal()
       this.productTypeSn = []
       this.queryParam.minUnsalableDays = undefined // 滞销天数最小值
@@ -435,6 +444,11 @@ export default {
       })
       // 是否默认包括禁用产品
       this.queryParam.enableFlag = localStorage.getItem('productEnabledFlag-' + this.$store.state.user.info.orgId) != 'false'
+      
+      this.$nextTick(() => {
+        this.queryParam.warehouse = []
+        this.$refs.warehouse.setDefaultVal()
+      })
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight

+ 1 - 1
src/views/numsGoodsShelves/customerAnalysis/list.vue

@@ -10,7 +10,7 @@
                   <shelfSList v-model="queryParam.shelfSn"></shelfSList>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
+              <a-col :md="8" :sm="24">
                 <a-form-item label="下单时间">
                   <rangeDate ref="orderDate" :value="orderTime" @change="orderDateChange" />
                 </a-form-item>

+ 3 - 3
src/views/numsGoodsShelves/vinAnalysis/vinList.vue

@@ -24,17 +24,17 @@
             </a-form-model-item>
           </a-col>
           <template v-if="advanced">
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="VIN">
                 <a-input id="vinAnaly-VIN" v-model.trim="queryParam.vinCode" allowClear placeholder="请输入VIN"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="车辆品牌">
                 <a-input id="vinAnaly-salesBillNo" v-model.trim="queryParam.brandName" allowClear placeholder="请输入车辆品牌"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="车型">
                 <a-input id="vinAnaly-salesManName" v-model.trim="queryParam.modelInfo" allowClear placeholder="请输入车型"/>
               </a-form-model-item>

+ 2 - 1
src/views/numsGoodsShelves/withdrawalManagement/applyWithdrawal.vue

@@ -45,9 +45,10 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { saveMerchantCashOut, merchantCashOutDetail } from '@/api/merchant'
-import { toThousands } from '@/libs/tools.js'
 export default {
+  mixins: [commonMixin],
   props: {
     isOpenModal: {
       type: Boolean,

+ 3 - 4
src/views/numsGoodsShelves/withdrawalManagement/list.vue

@@ -20,7 +20,7 @@
       <div style="margin:10px 0">
         <div style="display: flex;align-items: center;padding: 2px 0;">
           <div style="display: flex;align-items: center;">
-            可提现金额:<span>{{ pageInfo&&pageInfo.activeAmount?toThousands(pageInfo.activeAmount,2):'--' }}</span>
+            可提现金额:<span>{{ pageInfo&&pageInfo.activeAmount?toThousands(pageInfo.activeAmount):'--' }}</span>
             <a-button size="small" type="primary" class="button-primary" @click="handleTX">申请提现</a-button>
             <span>(提示:① 提现手续费为0.5元/笔;② 资金到账周期为工作日+1天)</span>
           </div>
@@ -51,13 +51,12 @@ import { STable } from '@/components'
 import applyWithdrawal from './applyWithdrawal.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { queryMerchantCashOutPage, merchantCashOutDetail } from '@/api/merchant'
-import { toThousands } from '@/libs/tools.js'
 export default {
   mixins: [commonMixin],
   components: { STable, applyWithdrawal, rangeDate },
   data () {
+    const _this = this
     return {
-      toThousands,
       spinning: false,
       disabled: false,
       tableHeight: 0,
@@ -73,7 +72,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '提现单号', dataIndex: 'cashOutNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '提现时间', dataIndex: 'cashOutDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '申请提现金额', dataIndex: 'amount', width: '10%', align: 'right', customRender: function (text) { return toThousands(text, 2) || '--' } },
+        { title: '申请提现金额', dataIndex: 'amount', width: '10%', align: 'right', customRender: function (text) {  return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } },
         { title: '开户名', dataIndex: 'bankAccount', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '银行卡号', dataIndex: 'bankCard', width: '20%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '提现人', dataIndex: 'operName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },

+ 3 - 2
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -164,7 +164,8 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import basicInfoModal from './basicInfoModal.vue'
 import stateIcon from '@/views/common/stateIcon'
 import getDate from '@/libs/getDate.js'
-import { purchaseList, purchaseDel, purchaseCount, purchaseTargetList } from '@/api/purchase'
+import { purchaseList, purchaseDel, purchaseCount } from '@/api/purchase'
+import { queryReturnSupplierList } from '@/api/purchaseReturn'
 export default {
   name: 'PurchaseList',
   components: { STable, VSelect, basicInfoModal, rangeDate, stateIcon },
@@ -328,7 +329,7 @@ export default {
     },
     // 获取供应商数据
     getSupperList () {
-      purchaseTargetList({}).then(res => {
+      queryReturnSupplierList({}).then(res => {
         if (res.status == 200) {
           this.supplierList = res.data
         } else {

+ 2 - 1
src/views/purchasingManagement/purchaseReturnApplyForm/edit.vue

@@ -47,7 +47,8 @@
               class="sTable"
               ref="table"
               size="small"
-              :rowKey="(record) => record.id"
+              :rowKey="(record) => record.code"
+              rowKeyName="code"
               :columns="columns"
               :data="loadData"
               :defaultLoadData="false"

+ 2 - 3
src/views/purchasingManagement/purchaseReturnOutSync/basicInfoModal.vue

@@ -49,8 +49,7 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import { VSelect } from '@/components'
-import { purchaseTargetList } from '@/api/purchase'
-import { purchaseReturnSaveByNoSync } from '@/api/purchaseReturn'
+import { purchaseReturnSaveByNoSync, queryReturnSupplierList } from '@/api/purchaseReturn'
 export default {
   name: 'BasicInfoModal',
   components: { VSelect },
@@ -154,7 +153,7 @@ export default {
         params = {}
       }
       console.log(params)
-      purchaseTargetList(params).then(res => {
+      queryReturnSupplierList(params).then(res => {
         if (res.status == 200 && res.data[0]) {
           this.purchaseTragetType = res.data
           this.$emit('load', res.data)

+ 2 - 1
src/views/purchasingManagement/purchaseReturnOutSync/edit.vue

@@ -57,7 +57,8 @@
                 class="sTable"
                 ref="table"
                 size="small"
-                :rowKey="(record) => record.id"
+                :rowKey="(record) => record.stockDetailSn"
+                rowKeyName="stockDetailSn"
                 :columns="columns"
                 :data="loadData"
                 :pageSize="10"

+ 4 - 4
src/views/reportData/purchaseReturnReport/purchaseReturnDetail.vue

@@ -84,7 +84,7 @@
       <div class="ftext" slot="message">
         产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
         <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
-          退货总成本:<strong>{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</strong>;
+          退货总成本:<strong>{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</strong>;
         </div>
       </div>
     </a-alert>
@@ -111,7 +111,7 @@ import ProductBrand from '../../common/productBrand.js'
 import { downloadExcel } from '@/libs/JGPrint.js'
 import supplier from '@/views/common/supplier'
 import { purchaseReturnDetailList, purchaseReturnDetailQueryCount, purchaseReturnDetailExport } from '@/api/reportData'
-import { purchaseTargetList } from '@/api/purchase'
+import { queryReturnSupplierList } from '@/api/purchaseReturn'
 export default {
   components: { STable, rangeDate, ProductType, ProductBrand, supplier },
   mixins: [commonMixin],
@@ -197,7 +197,7 @@ export default {
         { title: '出库时间', dataIndex: 'outStockTime', width: '16%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
       if (this.$hasPermissions('M_ShowAllCost')) { //  售价权限
-        arr.splice(7, 0, { title: '成本', dataIndex: 'cost', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(7, 0, { title: '成本', dataIndex: 'totalCost', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }
@@ -210,7 +210,7 @@ export default {
     },
     // 获取供应商数据
     getSupperList () {
-      purchaseTargetList({}).then(res => {
+      queryReturnSupplierList({}).then(res => {
         if (res.status == 200) {
           this.supplierList = res.data
         } else {

+ 6 - 5
src/views/reportData/purchaseReturnReport/purchaseReturnOrder.vue

@@ -57,7 +57,7 @@
     <!-- 合计 -->
     <a-alert type="info" style="margin-bottom:10px">
       <div class="ftext" slot="message">
-        总单数:<strong>{{ dataList?dataList.length :'--' }}</strong>;
+        总单数:<strong>{{ statisticsNum?statisticsNum :'--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
         <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
           退货总成本:<strong>{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</strong>;
@@ -84,7 +84,7 @@ import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { downloadExcel } from '@/libs/JGPrint.js'
 import { purchaseReturnList, purchaseReturnQueryCount, purchaseReturnExport } from '@/api/reportData'
-import { purchaseTargetList } from '@/api/purchase'
+import { queryReturnSupplierList } from '@/api/purchaseReturn'
 export default {
   components: { STable, VSelect, rangeDate },
   mixins: [commonMixin],
@@ -106,6 +106,7 @@ export default {
       },
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
+      statisticsNum: null,
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
@@ -126,7 +127,7 @@ export default {
               this.disabled = false
             }
             this.$emit('spinning', false)
-            this.dataList = data.list
+            this.statisticsNum = data.count
             return data
           })
         } else {
@@ -175,7 +176,7 @@ export default {
     },
     // 获取供应商数据
     getSupperList () {
-      purchaseTargetList({}).then(res => {
+      queryReturnSupplierList({}).then(res => {
         if (res.status == 200) {
           this.supplierList = res.data
         } else {
@@ -220,7 +221,7 @@ export default {
       this.queryParam.purchaseReturnNo = undefined
       this.queryParam.returnTargetSn = undefined
       this.totalData = null
-      this.dataList = null
+      this.statisticsNum = null
       this.$refs.ruleForm.resetFields()
       this.$refs.table.clearTable()
     },

+ 1 - 1
src/views/reportData/urgentItemsOffsetReport/detailList.vue

@@ -190,7 +190,7 @@ export default {
         { title: '冲减时间', dataIndex: 'offSetTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       if (this.$hasPermissions('M_ShowAllCost')) {
-        arr.splice(9, 0, { title: '成本', dataIndex: 'totalCost', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(8, 0, { title: '成本', dataIndex: 'totalCost', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }

+ 7 - 4
src/views/reportData/urgentItemsOffsetReport/list.vue

@@ -63,7 +63,7 @@
     <!-- 合计 -->
     <a-alert type="info" style="margin-bottom:10px">
       <div class="ftext" slot="message">
-        总单数:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
+        总单数:<strong>{{basiceNum?basiceNum:'--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
           冲减总成本:<strong>{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</strong>。
@@ -113,6 +113,7 @@ export default {
         'time': [{ required: true, message: '请选择冲减时间', trigger: 'change' }]
       },
       disabled: false, //  查询、重置按钮是否可操作
+      basiceNum:null,//列表数据
       exportLoading: false,
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -133,6 +134,7 @@ export default {
             this.disabled = false
           }
           this.spinning = false
+          this.basiceNum=data.count
           return data
         })
       },
@@ -148,13 +150,13 @@ export default {
         { title: '销售单号', dataIndex: 'bizBillNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         // { title: '单据来源', dataIndex: 'sourceTypeDictValue', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'buyerName', width: '20%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '款数', dataIndex: 'totalCategory', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '数量', dataIndex: 'totalQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '款数', dataIndex: 'totalCategory', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '数量', dataIndex: 'totalQty', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '成本', dataIndex: 'totalCost', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '冲减时间', dataIndex: 'offSetTime', width: '12%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       if (this.$hasPermissions('M_ShowAllCost')) {
-        arr.splice(7, 0, { title: '成本', dataIndex: 'totalCost', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(6, 0, { title: '成本', dataIndex: 'totalCost', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }
@@ -201,6 +203,7 @@ export default {
       this.$refs.rangeDate.resetDate()
       this.$refs.ruleForm.resetFields()
       this.totalData = null
+      this.basiceNum = null
       this.$refs.table.clearTable()
     },
     // 导出

+ 25 - 10
src/views/salesManagement/productPricing/list.vue

@@ -14,7 +14,7 @@
               <a-input id="productPricingList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="24">
+          <a-col :md="4" :sm="24">
             <a-form-item label="产品品牌">
               <ProductBrand id="productPricingList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
             </a-form-item>
@@ -30,9 +30,21 @@
                 <a-input id="productPricingList-origCode" v-model.trim="queryParam.origCode" allowClear placeholder="请输入原厂编码"/>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="产品状态">
+                <v-select
+                  code="ONLINE_FLAG"
+                  id="productPricingList-onlineFalg"
+                  v-model="queryParam.onlineFalg"
+                  allowClear
+                  placeholder="请选择产品状态"
+                ></v-select>
+              </a-form-item>
+            </a-col>
           </template>
-          <a-col :md="6" :sm="24">
-            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productPricingList-refresh">查询</a-button>
+          <a-col :md="8" :sm="24">
+            <a-checkbox v-model="queryParam.putStockFlag"><span style="display: inline-block;">显示未入库产品</span></a-checkbox>
+            <a-button style="margin-left: 10px" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productPricingList-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="productPricingList-reset">重置</a-button>
             <a @click="advanced=!advanced" style="margin-left: 5px">
               {{ advanced ? '收起' : '展开' }}
@@ -102,7 +114,9 @@ export default {
         productBrandSn: undefined,
         productTypeSn1: '',
         productTypeSn2: '',
-        productTypeSn3: ''
+        productTypeSn3: '',
+        onlineFalg: undefined,
+        putStockFlag: false
       },
       productType: [],
       disabled: false, //  查询、重置按钮是否可操作
@@ -110,7 +124,9 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        return dealerProductPriceList(Object.assign(parameter, this.queryParam)).then(res => {
+        const params = Object.assign(parameter, this.queryParam)
+        params.putStockFlag = params.putStockFlag ? 1 : 0
+        return dealerProductPriceList(params).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
@@ -141,11 +157,8 @@ export default {
         { title: '原厂编码', dataIndex: 'origCode', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'productBrandName', width: '11%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
         { title: '库存数量', dataIndex: 'stockQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { title: '成本价', dataIndex: 'offerCost', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { title: '市级价', dataIndex: 'cityPrice', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { title: '特约价', dataIndex: 'specialPrice', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { title: '终端会员价', dataIndex: 'terminalPrice', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '车主价', dataIndex: 'carOwnersPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '产品状态', dataIndex: 'onlineFalgDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
       ]
       if (this.isCostPrice) {
@@ -167,7 +180,7 @@ export default {
         arr.splice(ind, 0, { title: '特约价', dataIndex: 'specialPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.isTerminalPrice) {
-        arr.splice(arr.length - 1, 0, { title: '终端会员价', dataIndex: 'terminalPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(arr.length - 2, 0, { title: '终端会员价', dataIndex: 'terminalPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }
@@ -182,6 +195,8 @@ export default {
       this.queryParam.productTypeSn1 = ''
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn3 = ''
+      this.queryParam.onlineFalg = undefined
+      this.queryParam.putStockFlag = false
       this.productType = []
       this.$refs.table.refresh(true)
     },

+ 8 - 5
src/views/salesManagement/salesQuery/queryPart.vue

@@ -167,6 +167,7 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { querySumByProductLocation } from '@/api/stock'
 import { warehouseAllList } from '@/api/warehouse'
 import productSalesRecordModal from './productSalesRecordModal.vue'
@@ -179,6 +180,7 @@ import defImg from '@/assets/def_img@2x.png'
 export default {
   name: 'QueryPart',
   components: { STable, VSelect, Upload, productSalesRecordModal, carInfoModal, ProductType, ProductBrand },
+  mixins: [commonMixin],
   props: {
     newLoading: Boolean
   },
@@ -270,6 +272,7 @@ export default {
   },
   computed: {
     columns () {
+      const _this = this
       const arr = [
         { title: '产品编码', dataIndex: 'productCode', width: '15%', align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', width: '18%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
@@ -279,16 +282,16 @@ export default {
         { title: '仓位', dataIndex: 'warehouseLocationName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       if (this.cost) {
-        arr.push({ slots: { title: 'costTitle' }, dataIndex: 'putCost', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.push({ slots: { title: 'costTitle' }, dataIndex: 'putCost', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.cityPrice) {
-        arr.push({ title: '市级价', dataIndex: 'dealerProduct.cityPrice', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.push({ title: '市级价', dataIndex: 'dealerProduct.cityPrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.tyuePrice) {
-        arr.push({ title: '特约价', dataIndex: 'dealerProduct.specialPrice', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.push({ title: '特约价', dataIndex: 'dealerProduct.specialPrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.zdPrice) {
-        arr.push({ title: '终端价', dataIndex: 'dealerProduct.terminalPrice', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.push({ title: '终端价', dataIndex: 'dealerProduct.terminalPrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
 
       return arr.concat([
@@ -317,7 +320,7 @@ export default {
           data.list = data.list.filter(item => item != null)
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = data.list[i].productSn + '-' + (no + i + 1)
+            data.list[i].no = data.list[i].productSn + '_' + (no + i + 1)
             data.list[i].salesNums = 1
             data.list[i].currentQty = data.list[i].currentQty || 0
             data.list[i].price = data.list[i].lastSalePrice ? data.list[i].lastSalePrice : data.list[i].salePrice

+ 2 - 2
vue.config.js

@@ -211,8 +211,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.0.216:8076/qpls-md',
-        target: 'http://p.iscm.360arrow.com/qpls-md',
+        target: 'http://192.168.0.115:8503/qpls-md',
+        // target: 'http://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,