Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/components/bill/billApplication.vue

@@ -36,137 +36,137 @@
 </template>
 
 <script>
-import option from "./config/application.json";
-import { getBillList } from "@/api/financialManagement/paymentRequest";
+  import option from "./config/application.json";
+  import { getBillList } from "@/api/financialManagement/paymentRequest";
 
-export default {
-  name: "billApplication",
-  props:{
-    billType:{
-      type:String
-    },
-    choceApplication: {
-      type: Function
-    }
-  },
-  data() {
-    return {
-      loading : false,
-      form: {},
-      search:{},
-      show:true,
-      detailData:{},
-      option: option,
-      parentId:0,
-      dataList: [],
-      page: {
-        pageSize: 10,
-        pagerCount: 5,
-        total: 0,
-      },
-      query:{},
-      configuration:{
-        multipleChoices:false,
-        multiple:false,
-        disabled:false,
-        searchShow:true,
-        collapseTags:false,
-        clearable:true,
-        placeholder:'请点击右边按钮选择',
-        dicData:[]
+  export default {
+    name: "billApplication",
+    props:{
+      billType:{
+        type:String
       },
-      breakConfiguration:{
-        multipleChoices:false,
-        multiple:false,
-        disabled:false,
-        searchShow:true,
-        collapseTags:false,
-        clearable:true,
-        placeholder:'请点击右边按钮选择',
-        dicData:[]
-      },
-    }
-  },
-  created() {
-
-  },
-  mounted() {
-    option.height = window.innerHeight - 200 ;
-  },
-  methods: {
-    //新单打开
-    addReceipt(row){
-      this.detailData = {
-        id: row.id,
-        status: 1
-      };
-      this.show = false;
-    },
-    //编辑打开
-    editOpen(row, status){
-      this.detailData = {
-        id: row.id,
-        status: status
-      };
-      this.show = false;
-    },
-    rowDel(row, index, done) {
-      if(row.id){
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          remove(row.id).then(res =>{
-            if(res.data.success){
-              this.$message.success("操作成功!");
-              this.onLoad(this.page);
-            }
-          })
-        });
+      choceApplication: {
+        type: Function
       }
     },
-    //点击搜索按钮触发
-    searchChange(params, done) {
-      this.query = params;
-      this.page.currentPage = 1;
-      this.onLoad(this.page, params);
-      done()
-    },
-    searchReset() {
-      console.log('1')
-    },
-    selectionChange() {
-      console.log('1')
-    },
-    currentChange() {
-      console.log('1')
+    data() {
+      return {
+        loading : false,
+        form: {},
+        search:{},
+        show:true,
+        detailData:{},
+        option: option,
+        parentId:0,
+        dataList: [],
+        page: {
+          pageSize: 10,
+          pagerCount: 5,
+          total: 0,
+        },
+        query:{},
+        configuration:{
+          multipleChoices:false,
+          multiple:false,
+          disabled:false,
+          searchShow:true,
+          collapseTags:false,
+          clearable:true,
+          placeholder:'请点击右边按钮选择',
+          dicData:[]
+        },
+        breakConfiguration:{
+          multipleChoices:false,
+          multiple:false,
+          disabled:false,
+          searchShow:true,
+          collapseTags:false,
+          clearable:true,
+          placeholder:'请点击右边按钮选择',
+          dicData:[]
+        },
+      }
     },
-    sizeChange() {
-      console.log('1')
+    created() {
+
     },
-    refreshChange() {
-      console.log('1')
+    mounted() {
+      option.height = window.innerHeight - 200 ;
     },
-    onLoad(page, params = {}) {
-      this.loading = true;
-      if (params.createTime != undefined) {  //合同
-        params.createStartDate = params.createTime[0]+ " " + "00:00:00";
-        params.createEndDate = params.createTime[1] + " " + "23:59:59";
-        this.$delete(params,'createTime')
+    methods: {
+      //新单打开
+      addReceipt(row){
+        this.detailData = {
+          id: row.id,
+          status: 1
+        };
+        this.show = false;
+      },
+      //编辑打开
+      editOpen(row, status){
+        this.detailData = {
+          id: row.id,
+          status: status
+        };
+        this.show = false;
+      },
+      rowDel(row, index, done) {
+        if(row.id){
+          this.$confirm("确定将选择数据删除?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(() => {
+            remove(row.id).then(res =>{
+              if(res.data.success){
+                this.$message.success("操作成功!");
+                this.onLoad(this.page);
+              }
+            })
+          });
+        }
+      },
+      //点击搜索按钮触发
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done()
+      },
+      searchReset() {
+        console.log('1')
+      },
+      selectionChange() {
+        console.log('1')
+      },
+      currentChange() {
+        console.log('1')
+      },
+      sizeChange() {
+        console.log('1')
+      },
+      refreshChange() {
+        console.log('1')
+      },
+      onLoad(page, params = {}) {
+        this.loading = true;
+        if (params.createTime != undefined) {  //合同
+          params.createStartDate = params.createTime[0]+ " " + "00:00:00";
+          params.createEndDate = params.createTime[1] + " " + "23:59:59";
+          this.$delete(params,'createTime')
+        }
+        getBillList(page.currentPage, page.pageSize,params).then(res=>{
+          this.dataList = res.data.data.records
+          this.page.total = res.data.data.total
+          this.loading = false;
+        })
+      },
+      goBack() {
+        this.detailData=this.$options.data().detailData
+        this.show = true;
       }
-      getBillList(page.currentPage, page.pageSize,params).then(res=>{
-        this.dataList = res.data.data.records
-        this.page.total = res.data.data.total
-        this.loading = false;
-      })
-    },
-    goBack() {
-      this.detailData=this.$options.data().detailData
-      this.show = true;
     }
   }
-}
 </script>
 
 <style scoped>

src/components/bill/config/application.json

@@ -3,157 +3,87 @@
   "tip": false,
   "simplePage": true,
   "searchShow": true,
+  "addBtn":false,
+  "editBtn":false,
+  "addRowBtn":false,
+  "cellBtn":false,
+  "cancelBtn":false,
+  "refreshBtn": false,
+  "searchMenuPosition": "right",
   "searchMenuSpan": 24,
-  "dialogWidth": "60%",
-  "align": "center",
   "searchSpan": 8,
-  "searchMenuPosition": "right",
+  "align": "center",
+  "delBtn":true,
+  "dialogWidth": "60%",
+  "tree": true,
   "border": true,
   "index": true,
-  "selection": false,
-  "viewBtn": false,
-  "editBtn": false,
-  "delBtn": false,
-  "menuWidth": 180,
+  "selection": true,
   "menu": false,
-  "dialogClickModal": false,
-  "searchLabelWidth": 120,
+  "menuWidth": 0,
   "searchIcon": true,
   "searchIndex": 2,
-  "addBtn":false,
-  "headerAlign": "center",
+  "dialogClickModal": false,
   "column": [
     {
       "label": "合同号",
       "prop": "accSysNo",
-      "search": true,
       "overHidden": true,
-      "width": 120,
+      "search": true,
+      "width": 150,
       "index": 2
     },
     {
       "label": "提单号",
       "prop": "srcBillNo",
-      "search": true,
       "overHidden": true,
-      "width": 120,
-      "index": 3
-    },
-    {
-      "label": "客户名称",
-      "prop": "corpId",
       "search": true,
-      "hide": true,
-      "overHidden": true
+      "width": 150,
+      "index": 2
     },
     {
       "label": "客户名称",
       "prop": "corpName",
       "overHidden": true,
-      "width": 200,
-      "index": 4
-    },
-    {
-      "label": "单据状态",
-      "prop": "billType",
-      "type": "select",
-      "search": true,
-      "overHidden": true,
-      "index": 1,
-      "width": 120,
-      "dicData": [
-        {
-          "label": "申请",
-          "value": "申请"
-        },
-        {
-          "label": "销售",
-          "value":"销售"
-        }
-      ]
-    },
-    {
-      "label": "费用名称",
-      "prop": "itemName",
-      "overHidden": true,
+      "hide": true,
+      "search": false,
       "width": 150,
-      "index": 5
+      "index": 2
     },
     {
       "label": "费用名称",
       "prop": "costType",
-      "search": true,
-      "hide": true,
-      "overHidden": true
-    },
-    {
-      "label": "数量",
-      "prop": "quantity",
       "overHidden": true,
-      "width": 120,
-      "index": 6
+      "hide": true,
+      "search": true
     },
     {
-      "label": "单价",
-      "prop": "price",
-      "width": 120,
+      "label": "费用名称",
+      "prop": "itemName",
       "overHidden": true,
-      "index": 7
+      "width": 150,
+      "index": 4
     },
     {
-      "label": "账单金额",
+      "label": "金额",
       "prop": "amount",
       "overHidden": true,
-      "width": 120,
-      "index": 8
+      "width": 150,
+      "index": 7
     },
     {
       "label": "结算金额",
       "prop": "settlementAmount",
-      "width": 120,
-      "overHidden": true,
-      "index": 9
-    },
-    {
-      "label": "币别",
-      "prop": "currency",
-      "width": 120,
-      "overHidden": true,
-      "index": 10
-    },
-    {
-      "label": "汇率",
-      "prop": "exchangeRate",
-      "width": 120,
-      "overHidden": true,
-      "index": 11
-    },
-    {
-      "label": "录入人",
-      "prop": "createUserName",
-      "overHidden": true,
-      "index": 12,
-      "width": 120
-    },
-    {
-      "label": "录入日期",
-      "prop": "createTime",
-      "type": "date",
-      "search": true,
-      "unlinkPanels": true,
-      "searchRange": true,
+      "width": 150,
       "overHidden": true,
-      "format": "yyyy-MM-dd",
-      "valueFormat": "yyyy-MM-dd",
-      "width": 200,
-      "index": 13
+      "index": 8
     },
     {
       "label": "备注",
       "prop": "remark",
       "overHidden": true,
-      "index": 14,
-      "width": 200
+      "index": 13,
+      "width": 250
     }
   ]
 }

src/views/purchase/stockBill/config/mainList.json

@@ -1,139 +1,154 @@
 {
+  "headerAlign": "center",
+  "align": "center",
+  "border": true,
+  "index": true,
   "lazy": true,
   "tip": false,
-  "searchMenuPosition": "right",
-  "simplePage": true,
   "searchShow": true,
-  "dialogWidth": "60%",
-  "addBtn": false,
+  "searchMenuPosition": "right",
+  "searchMenuSpan": 6,
   "tree": true,
-  "border": true,
-  "index": true,
-  "selection": true,
+  "selection": false,
+  "addBtn": false,
   "viewBtn": false,
   "editBtn": false,
   "delBtn": false,
-  "menuWidth": 180,
-  "dialogClickModal": false,
-  "searchLabelWidth": 120,
-  "searchIcon": true,
-  "searchIndex": 2,
-  "searchSpan": 8,
+  "menuWidth": 150,
+  "searchLabelWidth": 100,
   "column": [
     {
-      "label": "大字(规格编码)",
-      "prop": "code",
+      "label": "状态",
+      "hide": true,
+      "prop": "status",
       "search": true,
-      "index": 1,
+      "width": 120,
+      "type": "select",
+      "dicData": [
+        {
+          "label": "已审核",
+          "value": "1"
+        },
+        {
+          "label": "正在结算",
+          "value": "4"
+        },
+        {
+          "label": "结算完成",
+          "value": "5"
+        }
+      ]
+    },
+    {
+      "label": "状态",
+      "prop": "strStatus",
+      "type": "select",
+      "overHidden": true,
+      "searchOrder": 5,
       "width": 120
     },
     {
-      "label": "名称",
-      "prop": "cname",
-      "search": true,
-      "index": 1,
-      "width": 100
+      "label": "客户名称",
+      "overHidden": true,
+      "prop": "cornName",
+      "width": 220
     },
     {
-      "label": "花纹",
-      "prop": "brandItem",
+      "label": "客户名称",
+      "hide": true,
       "search": true,
-      "index": 1,
-      "width": 100
+      "prop": "cornId",
+      "searchOrder": 1
     },
     {
-      "label": "产地",
-      "prop": "placeProduction",
-      "search": true,
-      "index": 1,
-      "width": 100
+      "label": "服务项目",
+      "prop": "pname",
+      "overHidden": true,
+      "width": 120
     },
     {
-      "label": "规格",
-      "prop": "typeno",
-      "search": true,
-      "index": 1,
-      "width": 100
+      "label": "任务部门",
+      "prop": "deptName",
+      "overHidden": true,
+      "width": 120
     },
     {
-      "label": "规格1",
-      "prop": "typenoOne",
-      "search": true,
-      "index": 1,
-      "width": 100
+      "label": "单价",
+      "prop": "price",
+      "overHidden": true,
+      "width": 120
     },
     {
-      "label": "品牌",
-      "prop": "brand",
-      "search": true,
-      "index": 1,
-      "width": 100
+      "label": "计价单位",
+      "prop": "unit",
+      "overHidden": true,
+      "width": 120
     },
     {
-      "label": "总库存",
-      "prop": "balanceQuantity",
-      "search": false,
-      "index": 1,
-      "width": 100,
-      "cell": true
+      "label": "数量",
+      "prop": "quantity",
+      "overHidden": true,
+      "width": 120
     },
     {
-      "label": "内贸锁定",
-      "prop": "lockingQuantity",
-      "search": false,
-      "index": 1,
-      "width": 100,
-      "cell": true
+      "label": "合计金额",
+      "prop": "amount",
+      "overHidden": true,
+      "width": 120
     },
     {
-      "label": "可用库存",
-      "prop": "surplusRouteQuantity",
-      "search": false,
-      "index": 1,
-      "width": 100,
-      "cell": true
+      "label": "频率",
+      "prop": "frequency",
+      "overHidden": true,
+      "width": 120
     },
     {
-      "label": "供应商",
-      "prop": "corpName",
-      "search": false,
-      "index": 1,
-      "width": 100
+      "label": "提醒日",
+      "prop": "reminderDay",
+      "valueFormat": "timestamp",
+      "overHidden": true,
+      "type": "date",
+      "width": 150
     },
     {
-      "label": "创建日期",
+      "label": "需求开始日期",
+      "prop": "beginTime",
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
       "type": "date",
       "unlinkPanels": true,
       "searchRange": true,
-      "prop": "createTime",
       "search": true,
-      "index": 1,
-      "width": 100,
-      "format": "yyyy-MM-dd",
-      "valueFormat": "yyyy-MM-dd",
       "overHidden": true,
-      "pickerOptions": {}
+      "searchOrder": 3,
+      "width": 150,
+      "cell": true
     },
     {
-      "label": "创建人",
+      "label": "制单人",
       "prop": "createUserName",
-      "search": false,
-      "index": 1,
-      "width": 100
+      "disabled": true,
+      "overHidden": true,
+      "width": 120
     },
     {
-      "label": "更新日期",
-      "prop": "updateTime",
-      "search": false,
-      "index": 1,
-      "width": 100
+      "label": "制单日期",
+      "prop": "createTime",
+      "disabled": true,
+      "overHidden": true,
+      "width": 150
     },
     {
-      "label": "更新人",
+      "label": "最新修改人",
       "prop": "updateUserName",
-      "search": false,
-      "index": 1,
-      "width": 100
+      "width": 120,
+      "overHidden": true
+    },
+    {
+      "label": "最新修改时间",
+      "prop": "updateTime",
+      "width": 150,
+      "overHidden": true
     }
   ]
 }

src/views/purchase/stockBill/index.vue

@@ -19,91 +19,91 @@
 </template>
 
 <script>
-import option from "./config/mainList.json";
-import { getBillList } from "@/api/financialManagement/paymentRequest";
+  import option from "./config/mainList.json";
+  import { getBillList } from "@/api/financialManagement/paymentRequest";
 
-export default {
-  data() {
-    return {
-      loading : false,
-      form: {},
-      search:{},
-      show:true,
-      detailData:{},
-      option: option,
-      parentId:0,
-      dataList: [],
-      page: {
-        pageSize: 10,
-        pagerCount: 5,
-        total: 0,
-      },
-      query:{},
-    }
-  },
-  created() {
-
-  },
-  mounted() {
-    option.height = window.innerHeight - 200 ;
-  },
-  methods: {
-    //新单打开
-    addReceipt(row){
-
-    },
-    //编辑打开
-    editOpen(row, status){
-
-    },
-    rowDel(row, index, done) {
-      if(row.id){
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-
-        });
+  export default {
+    data() {
+      return {
+        loading : false,
+        form: {},
+        search:{},
+        show:true,
+        detailData:{},
+        option: option,
+        parentId:0,
+        dataList: [],
+        page: {
+          pageSize: 10,
+          pagerCount: 5,
+          total: 0,
+        },
+        query:{},
       }
     },
-    //点击搜索按钮触发
-    searchChange(params, done) {
-      this.query = params;
-      this.page.currentPage = 1;
-      this.onLoad(this.page, params);
-      done()
-    },
-    searchReset() {
-      console.log('1')
-    },
-    selectionChange() {
-      console.log('1')
-    },
-    currentChange() {
-      console.log('1')
-    },
-    sizeChange() {
-      console.log('1')
-    },
-    refreshChange() {
-      console.log('1')
+    created() {
+
     },
-    onLoad(page, params = {}) {
-      // this.loading = true;
-      // if (params.createTime != undefined) {  //合同
-      //   params.createStartDate = params.createTime[0]+ " " + "00:00:00";
-      //   params.createEndDate = params.createTime[1] + " " + "23:59:59";
-      //   this.$delete(params,'createTime')
-      // }
-      // getBillList(page.currentPage, page.pageSize,params).then(res=>{
-      //   this.dataList = res.data.data.records
-      //   this.page.total = res.data.data.total
-      //   this.loading = false;
-      // })
+    mounted() {
+      option.height = window.innerHeight - 200 ;
     },
+    methods: {
+      //新单打开
+      addReceipt(row){
+
+      },
+      //编辑打开
+      editOpen(row, status){
+
+      },
+      rowDel(row, index, done) {
+        if(row.id){
+          this.$confirm("确定将选择数据删除?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(() => {
+
+          });
+        }
+      },
+      //点击搜索按钮触发
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done()
+      },
+      searchReset() {
+        console.log('1')
+      },
+      selectionChange() {
+        console.log('1')
+      },
+      currentChange() {
+        console.log('1')
+      },
+      sizeChange() {
+        console.log('1')
+      },
+      refreshChange() {
+        console.log('1')
+      },
+      onLoad(page, params = {}) {
+        // this.loading = true;
+        // if (params.createTime != undefined) {  //合同
+        //   params.createStartDate = params.createTime[0]+ " " + "00:00:00";
+        //   params.createEndDate = params.createTime[1] + " " + "23:59:59";
+        //   this.$delete(params,'createTime')
+        // }
+        // getBillList(page.currentPage, page.pageSize,params).then(res=>{
+        //   this.dataList = res.data.data.records
+        //   this.page.total = res.data.data.total
+        //   this.loading = false;
+        // })
+      },
+    }
   }
-}
 </script>
 
 <style scoped>