Browse Source

修改货代配箱 用户 机构 轮胎融资 销售采购上架

Qukatie 7 tháng trước cách đây
mục cha
commit
3891acd5d8

+ 38 - 1
src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/PackingBusiness.vue

@@ -118,6 +118,11 @@
                             label="hsCode" url="/blade-los/bcommodity/list" :filterable="true" :remote="true"
                             res="records" dataName="hsCode" @selectChange="dicChange('hscode', $event)"></dic-select>
                     </template>
+                    <tempalte slot-scope="{type,disabled}" slot="packingLevelForm">
+                        <dic-select v-model="Detailform.packingLevel" placeholder="包装等级" key="dictKey"
+                            label="dictValue" url="/blade-system/dict-biz/dictionary?code=hazard_Level"
+                            :filterable="true"></dic-select>
+                    </tempalte>
                     <template slot-scope="{type,disabled}" slot="packingUnitForm">
                         <dic-select style="width: 100%;" v-model="Detailform.packingUnit" placeholder="包装单位" key="id"
                             label="cnName" url="/blade-los/bpackages/list" :filterable="true" :remote="true"
@@ -324,7 +329,7 @@ export default {
                         prop: "commodityCnName",
                         labelWidth: 100,
                         width: "120",
-                        display: false,
+                        // display: false,
                         overHidden: true,
                     },
                     {
@@ -344,6 +349,14 @@ export default {
                         cell: true,
                     },
                     {
+                        label: "包装等级",
+                        prop: "packingLevel",
+                        labelWidth: 100,
+                        width: "120",
+                        overHidden: true,
+                        cell: true,
+                    },
+                    {
                         label: "货物描述",
                         prop: "commodityDescr",
                         labelWidth: 100,
@@ -383,6 +396,8 @@ export default {
                         prop: "quantity",
                         labelWidth: 100,
                         width: "120",
+                        type: 'number',
+                        controls: false,
                         overHidden: true,
                         cell: true,
                     },
@@ -391,6 +406,8 @@ export default {
                         prop: "grossWeight",
                         labelWidth: 100,
                         width: "120",
+                        type: 'number',
+                        controls: false,
                         overHidden: true,
                         cell: true,
                     },
@@ -399,6 +416,8 @@ export default {
                         prop: "netWeight",
                         labelWidth: 100,
                         width: "120",
+                        type: 'number',
+                        controls: false,
                         overHidden: true,
                         cell: true,
                     },
@@ -407,6 +426,8 @@ export default {
                         prop: "measurement",
                         labelWidth: 100,
                         width: "120",
+                        type: 'number',
+                        controls: false,
                         overHidden: true,
                         cell: true,
                     },
@@ -662,6 +683,22 @@ export default {
                         overHidden: true,
                         cell: true,
                     },
+                    {
+                        label: "CUS CODE",
+                        prop: "cusCode",
+                        labelWidth: 100,
+                        width: "120",
+                        overHidden: true,
+                        cell: true,
+                    },
+                    {
+                        label: "NCM",
+                        prop: "ncm",
+                        labelWidth: 100,
+                        width: "120",
+                        overHidden: true,
+                        cell: true,
+                    },
                 ]
             },
             selectionDetailList: [], // 选中的数据

+ 5 - 5
src/views/system/dept.vue

@@ -322,11 +322,11 @@
               type: "number",
               align: "right",
               width: 60,
-              rules: [{
-                required: true,
-                message: "请输入排序",
-                trigger: "blur"
-              }]
+              // rules: [{
+              //   required: true,
+              //   message: "请输入排序",
+              //   trigger: "blur"
+              // }]
             },
             {
               label: "备注",

+ 10 - 10
src/views/system/user.vue

@@ -484,11 +484,11 @@
                   label: "手机号码",
                   prop: "phone",
                   overHidden: true,
-                  rules: [{
-                    required: true,
-                    message: "请输入手机号码",
-                    trigger: "blur"
-                  }]
+                  // rules: [{
+                  //   required: true,
+                  //   message: "请输入手机号码",
+                  //   trigger: "blur"
+                  // }]
                 },
                 {
                   label: "电子邮箱",
@@ -629,11 +629,11 @@
                     label: "postName",
                     value: "id"
                   },
-                  rules: [{
-                    required: true,
-                    message: "请选择所属岗位",
-                    trigger: "click"
-                  }],
+                  // rules: [{
+                  //   required: true,
+                  //   message: "请选择所属岗位",
+                  //   trigger: "click"
+                  // }],
                 },
               ]
             },

+ 16 - 4
src/views/tirePartsMall/basicData/listingManagement/index.vue

@@ -467,6 +467,8 @@ export default {
           prop: "explosionProof",
           display: false,
           search: true,
+          hide: false,
+          showColumn: true,
           span: 8,
           type: 'select',
           dicData: [{
@@ -481,6 +483,8 @@ export default {
           prop: "originalFactory",
           display: false,
           search: true,
+          hide: false,
+          showColumn: true,
           span: 8,
           type: 'select',
           dicData: [{
@@ -496,6 +500,8 @@ export default {
           prop: "selfRecovery",
           display: false,
           search: true,
+          hide: false,
+          showColumn: true,
           span: 8,
           type: 'select',
           dicData: [{
@@ -541,6 +547,12 @@ export default {
         this.findObject(this.option.column, "explosionProof").search = false
         this.findObject(this.option.column, "originalFactory").search = false
         this.findObject(this.option.column, "selfRecovery").search = false
+        this.findObject(this.option.column, "explosionProof").hide = true
+        this.findObject(this.option.column, "originalFactory").hide = true
+        this.findObject(this.option.column, "selfRecovery").hide = true
+        this.findObject(this.option.column, "explosionProof").showColumn = false
+        this.findObject(this.option.column, "originalFactory").showColumn = false
+        this.findObject(this.option.column, "selfRecovery").showColumn = false
       }
     })
     this.key++
@@ -1055,8 +1067,8 @@ export default {
           this.findObject(this.option.column, "brandItem").label = '规格型号1'
           this.findObject(this.optionTwo.column, "brandItem").label = '规格型号1'
           this.findObject(this.optionTwo.column, "cname").label = '名称'
-        this.findObject(this.optionTwo.column, "code").label = '编码'
-        this.findObject(this.optionTwo.column, "goodsTypeId").label = '类别'
+          this.findObject(this.optionTwo.column, "code").label = '编码'
+          this.findObject(this.optionTwo.column, "goodsTypeId").label = '类别'
           this.findObject(this.option.column, "explosionProof").search = false
           this.findObject(this.option.column, "originalFactory").search = false
           this.findObject(this.option.column, "selfRecovery").search = false
@@ -1079,8 +1091,8 @@ export default {
           this.findObject(this.option.column, "brandItem").label = '规格型号1'
           this.findObject(this.optionTwo.column, "brandItem").label = '规格型号1'
           this.findObject(this.optionTwo.column, "cname").label = '名称'
-        this.findObject(this.optionTwo.column, "code").label = '编码'
-        this.findObject(this.optionTwo.column, "goodsTypeId").label = '类别'
+          this.findObject(this.optionTwo.column, "code").label = '编码'
+          this.findObject(this.optionTwo.column, "goodsTypeId").label = '类别'
           this.findObject(this.option.column, "explosionProof").search = false
           this.findObject(this.option.column, "originalFactory").search = false
           this.findObject(this.option.column, "selfRecovery").search = false

+ 6 - 0
src/views/tirePartsMall/configuration/commodity.json

@@ -128,6 +128,8 @@
       "prop": "originalFactory",
       "type":"select",
       "search":true,
+      "hide": false,
+      "showColumn": true,
       "width": 120,
       "dicData":[{
         "label":"否",
@@ -142,6 +144,8 @@
       "prop": "explosionProof",
       "type":"select",
       "search":true,
+      "hide": false,
+      "showColumn": true,
       "width": 120,
       "dicData":[{
         "label":"否",
@@ -156,6 +160,8 @@
       "prop": "selfRecovery",
       "type":"select",
       "search":true,
+      "hide": false,
+      "showColumn": true,
       "width": 120,
       "dicData":[{
         "label":"否",

+ 6 - 0
src/views/tirePartsMall/configuration/commodityxsho.json

@@ -133,6 +133,8 @@
       "prop": "originalFactory",
       "type":"select",
       "search":true,
+      "hide": false,
+      "showColumn": true,
       "width": 120,
       "dicData":[{
         "label":"否",
@@ -147,6 +149,8 @@
       "prop": "explosionProof",
       "type":"select",
       "search":true,
+      "hide": false,
+      "showColumn": true,
       "width": 120,
       "dicData":[{
         "label":"否",
@@ -161,6 +165,8 @@
       "prop": "selfRecovery",
       "type":"select",
       "search":true,
+      "hide": false,
+      "showColumn": true,
       "width": 120,
       "dicData":[{
         "label":"否",

+ 12 - 4
src/views/tirePartsMall/purchasingManagement/financingProcurement/detailsPage.vue

@@ -89,6 +89,11 @@
                         <el-input placeholder="请输入 参考号" v-model="form.refno">
                         </el-input>
                     </tempalte>
+                    <tempalte slot="useAdvanceChargeAmount" slot-scope="{ row }">
+                        <el-input-number style="width: 100%;" placeholder="请输入 预付款"
+                            v-model="form.useAdvanceChargeAmount" :controls="false">
+                        </el-input-number>
+                    </tempalte>
                     <tempalte slot="remarks" slot-scope="{ row }">
                         <el-input type="textarea" :rows="2" placeholder="请输入 备注" v-model="form.remarks">
                         </el-input>
@@ -2004,10 +2009,13 @@ export default {
                             } else {
                             }
                         }
-                        if (this.form.orderItemsList[i].goodsNum <= 0) {
-                            this.$message.warning(`采购明细序号${Number(i) + 1}的数量不能为零`);
-                            picihao = true
+                        if (this.form.status != '已收货') {
+                            if (this.form.orderItemsList[i].goodsNum <= 0) {
+                                this.$message.warning(`采购明细序号${Number(i) + 1}的数量不能为零`);
+                                picihao = true
+                            }
                         }
+
                     }
                     this.mingxibaocun = true
                     if (picihao) {
@@ -2192,7 +2200,7 @@ export default {
         },
         //请核数据qing
         applySettlement(type) {
-            let spr="订单金额:"+this.form.totalMoney+'元;'+"融资金额:"+this.form.fundingAmount+'元;'+"保证金:"+this.form.bondAmount+'元;<br/>'+"<span style='color:red'>预付款:"+this.form.useAdvanceChargeAmount+'元;</span>'
+            let spr = "订单金额:" + this.form.totalMoney + '元;' + "融资金额:" + this.form.fundingAmount + '元;' + "保证金:" + this.form.bondAmount + '元;<br/>' + "<span style='color:red'>预付款:" + this.form.useAdvanceChargeAmount + '元;</span>'
             this.$confirm(spr, {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",

+ 119 - 90
src/views/tirePartsMall/purchasingManagement/financingProcurement/index.vue

@@ -40,7 +40,7 @@
         </template>
         <template slot-scope="{type,size,row,$index}" slot="menuLeft">
 
-          <el-button icon="el-icon-plus" type="primary" :size="size" @click="detailsOpen = true">新建订单</el-button>
+          <el-button icon="el-icon-plus" type="primary" :size="size" @click="newOrder">新建订单</el-button>
           <el-button type="warning" icon="el-icon-download" size="small" @click="outExport">导出</el-button>
         </template>
         <template slot-scope="{ row, index }" slot="ordNo">
@@ -63,6 +63,7 @@ import detailsPage from "./detailsPage"
 import { getDetails } from "@/api/tirePartsMall/salesManagement/saleOrder";
 import { getToken } from "@/util/auth";
 import { dateFormat } from '@/util/date'
+import { isProcurement } from "@/api/basicData/configuration";
 export default {
   name: "index",
   components: {
@@ -70,6 +71,7 @@ export default {
   },
   data() {
     return {
+      whetherFinancing: null,
       orderStatusList: [],
       actualStatusList: [],
       returnStatusList: [],
@@ -383,7 +385,7 @@ export default {
           {
             label: '订单保证金',
             prop: "primaryBondAmount",
-            width:100,
+            width: 100,
             disabled: true,
           }, {
             label: '订单数量',
@@ -607,35 +609,48 @@ export default {
     this.getWorkDicts("return_Status").then(res => {
       this.returnStatusList = res.data.data
     });
+    isProcurement({ "param": "whether.financing" }).then(res => {
+      this.whetherFinancing = res.data.data
+    })
   },
   methods: {
+    newOrder() {
+      if (this.whetherFinancing == 1) {
+        this.detailsOpen = true
+      } else {
+        this.$message.error("该功能未开通,请联系管理员");
+      }
+    },
     // 导出
     outExport() {
-      console.log(this.search, 412)
-      let config = { params: { ...this.search } }
-      if (config.params) {
-        for (const propName of Object.keys(config.params)) {
-          const value = config.params[propName];
-          if (value !== null && typeof (value) !== "undefined") {
-            if (value instanceof Array) {
-              for (const key of Object.keys(value)) {
-                let params = propName + '[' + key + ']';
-                config.params[params] = value[key]
+      if (this.whetherFinancing == 1) {
+        let config = { params: { ...this.search } }
+        if (config.params) {
+          for (const propName of Object.keys(config.params)) {
+            const value = config.params[propName];
+            if (value !== null && typeof (value) !== "undefined") {
+              if (value instanceof Array) {
+                for (const key of Object.keys(value)) {
+                  let params = propName + '[' + key + ']';
+                  config.params[params] = value[key]
+                }
+                delete config.params[propName]
               }
-              delete config.params[propName]
             }
           }
         }
+        config.params.bsType = 'RZCG'
+        console.log(config, 427)
+        const routeData = this.$router.resolve({
+          path: '/api/blade-sales-part/order/listExport',      //跳转目标下载地址
+          query: {
+            ...config.params    //括号内是要传递给新窗口的参数
+          }
+        })
+        window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+      } else {
+        this.$message.error("该功能未开通,请联系管理员");
       }
-      config.params.bsType = 'RZCG'
-      console.log(config, 427)
-      const routeData = this.$router.resolve({
-        path: '/api/blade-sales-part/order/listExport',      //跳转目标下载地址
-        query: {
-          ...config.params    //括号内是要传递给新窗口的参数
-        }
-      })
-      window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
     },
     check(row) {
       this.form = row
@@ -651,92 +666,106 @@ export default {
       this.onLoad(this.page, this.search)
     },
     editOpen(row, status) {
-      this.form = row
-      this.detailData = {
-        id: row.id,
-        status: status
-      };
-      console.log(status);
-      this.$store.commit("IN_FINACING_DETAIL");
-      this.detailsOpen = true;
+      if (this.whetherFinancing == 1) {
+        this.form = row
+        this.detailData = {
+          id: row.id,
+          status: status
+        };
+        console.log(status);
+        this.$store.commit("IN_FINACING_DETAIL");
+        this.detailsOpen = true;
+      } else {
+        this.$message.error("该功能未开通,请联系管理员");
+      }
+
     },
     //刷新
     refreshChange() {
       this.onLoad(this.page, this.search)
     },
     confirm(row, index, type) {
-      if (type == 1) {
-        if (row.goodsTotalShipNum == 0) return this.$message.error("入库数量为0,请先入库");
-        this.$confirm('采购数量:' + row.goodsTotalNum + ',金额:' + row.totalMoney + '<br/>到货数量:' + row.goodsTotalShipNum + ',金额:' + row.goodsTotalShipAmount, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-          dangerouslyUseHTMLString: true,
-        }).then(() => {
-          confirmWarehouse(row).then(res => {
-            this.$message.success("确认成功");
-            this.onLoad(this.page, this.search)
+      if (this.whetherFinancing == 1) {
+        if (type == 1) {
+          if (row.goodsTotalShipNum == 0) return this.$message.error("入库数量为0,请先入库");
+          this.$confirm('采购数量:' + row.goodsTotalNum + ',金额:' + row.totalMoney + '<br/>到货数量:' + row.goodsTotalShipNum + ',金额:' + row.goodsTotalShipAmount, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+            dangerouslyUseHTMLString: true,
+          }).then(() => {
+            confirmWarehouse(row).then(res => {
+              this.$message.success("确认成功");
+              this.onLoad(this.page, this.search)
+            })
           })
-        })
-      }
-      if (type == 2) {
-        this.$confirm('是否撤销到货?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          revokeWarehouse(row).then(res => {
-            this.$message.success("撤销成功");
-            this.onLoad(this.page, this.search)
+        }
+        if (type == 2) {
+          this.$confirm('是否撤销到货?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            revokeWarehouse(row).then(res => {
+              this.$message.success("撤销成功");
+              this.onLoad(this.page, this.search)
+            })
           })
-        })
 
-      }
-      if (type == 3) {
-        const start = new Date(row.businesDate);
-        const end = new Date(dateFormat(new Date(), 'yyyy-MM-dd'))
-        const daysDiff = (end - start) / (1000 * 60 * 60 * 24);
-        this.$confirm('订单超过90天需要赎回,当前单据为' + daysDiff + '天,确实要赎回吗?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          confirmRedeem(row).then(res => {
-            this.$message.success("确认成功");
-            this.onLoad(this.page, this.search)
+        }
+        if (type == 3) {
+          const start = new Date(row.businesDate);
+          const end = new Date(dateFormat(new Date(), 'yyyy-MM-dd'))
+          const daysDiff = (end - start) / (1000 * 60 * 60 * 24);
+          this.$confirm('订单超过90天需要赎回,当前单据为' + daysDiff + '天,确实要赎回吗?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            confirmRedeem(row).then(res => {
+              this.$message.success("确认成功");
+              this.onLoad(this.page, this.search)
+            })
           })
-        })
 
+        }
+        if (type == 4) {
+          this.$confirm('是否撤销赎回?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            revokeRedeem(row).then(res => {
+              this.$message.success("撤销成功");
+              this.onLoad(this.page, this.search)
+            })
+          })
+        }
+      } else {
+        this.$message.error("该功能未开通,请联系管理员");
       }
-      if (type == 4) {
-        this.$confirm('是否撤销赎回?', '提示', {
+    },
+    rowDel(form, index) {
+      if (this.whetherFinancing == 1) {
+        this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          revokeRedeem(row).then(res => {
-            this.$message.success("撤销成功");
-            this.onLoad(this.page, this.search)
+          remove({ id: form.id }).then(res => {
+            this.$message({
+              type: 'success',
+              message: '删除成功!'
+            });
+            this.dataList.splice(index, 1);
+            this.onLoad(this.page)
           })
-        })
+        }).catch(() => {
+        });
+      } else {
+        this.$message.error("该功能未开通,请联系管理员");
       }
-    },
-    rowDel(form, index) {
-      this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        remove({ id: form.id }).then(res => {
-          this.$message({
-            type: 'success',
-            message: '删除成功!'
-          });
-          this.dataList.splice(index, 1);
-          this.onLoad(this.page)
-        })
-      }).catch(() => {
-      });
+
     },
     // 点击搜索触发
     searchChange(params, done) {

+ 6 - 0
src/views/tirePartsMall/salesManagement/purchaseOrder/detailsPage.vue

@@ -1114,6 +1114,12 @@ export default {
                 this.findObject(this.optionTwo.column, "originalFactory").search = false
                 this.findObject(this.optionTwo.column, "explosionProof").search = false
                 this.findObject(this.optionTwo.column, "selfRecovery").search = false
+                this.findObject(this.optionTwo.column, "explosionProof").hide = true
+                this.findObject(this.optionTwo.column, "originalFactory").hide = true
+                this.findObject(this.optionTwo.column, "selfRecovery").hide = true
+                this.findObject(this.optionTwo.column, "explosionProof").showColumn = false
+                this.findObject(this.optionTwo.column, "originalFactory").showColumn = false
+                this.findObject(this.optionTwo.column, "selfRecovery").showColumn = false
             }
         })
         this.findObject(this.optionContacts.column, "goodsId").change = ({ value, column }) => {

+ 6 - 0
src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -1218,6 +1218,12 @@ export default {
                 this.findObject(this.optionTwo.column, "originalFactory").search = false
                 this.findObject(this.optionTwo.column, "explosionProof").search = false
                 this.findObject(this.optionTwo.column, "selfRecovery").search = false
+                this.findObject(this.optionTwo.column, "explosionProof").hide = true
+                this.findObject(this.optionTwo.column, "originalFactory").hide = true
+                this.findObject(this.optionTwo.column, "selfRecovery").hide = true
+                this.findObject(this.optionTwo.column, "explosionProof").showColumn = false
+                this.findObject(this.optionTwo.column, "originalFactory").showColumn = false
+                this.findObject(this.optionTwo.column, "selfRecovery").showColumn = false
             }
         })
         this.findObject(this.optionContacts.column, "goodsId").change = ({ value, column }) => {