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

src/api/basicData/configuration.js

@@ -1,4 +1,5 @@
 import request from '@/router/axios';
+import {getMarketDetailsList} from "../importTrade/purchase";
 
 //客户资料列表查询
 export function customerList(data) {
@@ -129,3 +130,15 @@ export function corpstypeTree() {
         method: 'get'
     })
 }
+
+//生成采购单
+export function saveSell(data) {
+  return request({
+    url: '/api/blade-purchase-sales/order/createMarket',
+    method: 'post',
+    data: {
+      id: data
+    }
+  })
+}
+

src/api/basicData/purchaseOrder.js

@@ -138,3 +138,16 @@ export function generateShipment(data) {
     data:data
   })
 }
+
+// 获取销售订单明细
+export function getGNMarketDetailsList(current,size,params) {
+  return request({
+    url: '/api/blade-purchase-sales/order/orderItemsList',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}

src/api/exportTrade/purchaseContract.js

@@ -95,4 +95,16 @@ export function getSpecification(query) {
     method: 'get',
     params: query
   })
-}
+}
+// 获取销售订单明细详情
+export function getCKMarketDetailsList(current,size,params) {
+  return request({
+    url: '/api/blade-purchase-sales/exportOrder/orderItemsList',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}

src/api/workManagement/mainProject.js

@@ -73,3 +73,14 @@ export function getSysNo() {
     method: 'get'
   })
 }
+
+//子表ID查询父表ID
+export function getPidByItemId(itemId) {
+  return request({
+    url: '/api/trade-project/project/getPidByItemId',
+    method: 'get',
+    params:{
+      itemId:itemId
+    }
+  })
+}

src/components/procurement/market.vue

@@ -11,9 +11,9 @@
                :page.sync="page"
                @on-load="onLoad">
     </avue-crud>
-    <div style="margin-left: 90%">
-       <span slot="footer" class="dialog-footer" >
-           <el-button @click="closeFun()">取 消</el-button>
+    <div class="botoom">
+       <span slot="footer" class="dialog-footer">
+           <el-button @click="closeDialog">取 消</el-button>
            <el-button type="primary" @click="importMarket" :disabled="selectMarketList.length == 0">导入</el-button>
        </span>
     </div>
@@ -23,6 +23,8 @@
 <script>
   import option from './config/market.json'
   import {getMarketDetailsList} from "@/api/importTrade/purchase";
+  import {getGNMarketDetailsList} from "@/api/basicData/purchaseOrder";
+  import {getCKMarketDetailsList} from "@/api/exportTrade/purchaseContract";
 
   export default {
     name: "index",
@@ -32,7 +34,11 @@
       },
       closeFun: {
         type: Function
-      }
+      },
+      // 系统来源
+      systemType: {
+        type: String
+      },
     },
     data(){
       return {
@@ -68,17 +74,36 @@
           params.orderEndDate = params.marketDate[1] + " " + "23:59:59";
           this.$delete(params,'marketDate')
         }
-        getMarketDetailsList(page.currentPage, page.pageSize,params).then(res=>{
-          this.data = res.data.data.records
-          this.page.total = res.data.data.total
-        })
-          .finally(()=>{
-          this.loading = false;
-        })
+        if (this.systemType == 'JK') {
+          getMarketDetailsList(page.currentPage, page.pageSize,params).then(res=>{
+            this.data = res.data.data.records
+            this.page.total = res.data.data.total
+          })
+            .finally(()=>{
+              this.loading = false;
+            })
+        } else if (this.systemType == 'CK') {
+          getCKMarketDetailsList(page.currentPage, page.pageSize,params).then(res=>{
+            this.data = res.data.data.records
+            this.page.total = res.data.data.total
+          }).finally(()=>{
+            this.loading = false;
+          })
+        } else if (this.systemType == 'GN') {
+          getGNMarketDetailsList(page.currentPage, page.pageSize,params).then(res=>{
+            this.data = res.data.data.records
+            this.page.total = res.data.data.total
+          }).finally(()=>{
+            this.loading = false;
+          })
+        }
       },
       importMarket(){
         this.$emit('importMarket',this.selectMarketList);
       },
+      closeDialog() {
+        this.$emit('close')
+      },
       //列保存触发
       async saveColumn() {
         const inSave = await this.saveColumnData(
@@ -95,5 +120,14 @@
   }
 </script>
 <style scoped>
-
+.botoom:after {
+  content: '';
+  display: block;
+  height: 0;
+  clear: both;
+}
+.dialog-footer {
+  display: flex;
+  float: right;
+}
 </style>

src/components/selectComponent/configuration/mainList.json

@@ -6,7 +6,7 @@
     "searchMenuSpan": 6,
     "dialogWidth": "60%",
     "searchShowBtn": false,
-    "searchShow": false,
+    "searchShow": true,
     "menu": false,
     "addBtn": false,
     "tree": true,
@@ -22,7 +22,7 @@
         {
             "label": "客户编码",
             "prop": "code",
-            "search": true,
+            "search": false,
             "index": 1,
             "width":100,
             "rules": [
@@ -48,7 +48,7 @@
         },{
             "label": "区域",
             "prop": "belongtoarea",
-            "search": true,
+            "search": false,
             "index": 4,
             "width":180,
             "rules": [
@@ -61,7 +61,7 @@
         },{
             "label": "所属公司",
             "prop": "belongtocompany",
-            "search": true,
+            "search": false,
             "index": 5,
             "width":100,
             "rules": [
@@ -74,7 +74,7 @@
         },{
             "label": "联系人",
             "prop": "attn",
-            "search": true,
+            "search": false,
             "index": 6,
             "width":100,
             "rules": [
@@ -87,7 +87,7 @@
         },{
             "label": "代理品牌",
             "prop": "goodtypes",
-            "search": true,
+            "search": false,
             "index": 7,
             "width":100,
             "rules": [
@@ -100,7 +100,7 @@
         },{
             "label": "客户等级 ",
             "prop": "creditLevel",
-            "search": true,
+            "search": false,
             "index": 8,
             "width":100,
             "rules": [

src/components/selectComponent/customerSelect.vue

@@ -130,7 +130,7 @@ export default {
     }
   },
   created() {
-    this.option.searchShow = this.configuration.searchShow ? this.configuration.searchShow : false
+    // this.option.searchShow = this.configuration.searchShow ? this.configuration.searchShow : false
     this.remoteMethod()
   },
   methods: {
@@ -234,7 +234,7 @@ export default {
     },
     // 远程模糊查找
     remoteMethod(query) {
-      if (query !== '') {
+      if (query) {
         this.loading = true;
         this.queryParams = {
           size: 10,
@@ -252,11 +252,22 @@ export default {
           current: 1
         }
         customerList(this.queryParams).then(res => {
-          this.dicData = res.data.data.records
+          this.dicData = []
+          this.configuration.dicData = this.configuration.dicData.concat(res.data.data.records)
+          // this.configuration.dicData = res.data.data.records
+          this.removeRepeat()
           this.loading = false;
         });
       }
     },
+    // 去重
+    removeRepeat() {
+      let obj = []
+      this.configuration.dicData = this.configuration.dicData.reduce((current,next) => {
+        obj[next.id] ? '': obj[next.id] = true && current.push(next)
+        return current
+      }, [])
+    },
   }
 };
 </script>

src/components/warehouseSelect/configuration/mainList.json

@@ -6,7 +6,7 @@
   "searchMenuSpan": 6,
   "dialogWidth": "60%",
   "searchShowBtn": false,
-  "searchShow": false,
+  "searchShow": true,
   "menu": false,
   "addBtn": false,
   "tree": true,
@@ -22,7 +22,7 @@
     {
       "label": "库区编码",
       "prop": "code",
-      "search": true,
+      "search": false,
       "index": 1,
       "width": 100,
       "rules": [
@@ -50,7 +50,7 @@
     {
       "label": "地址",
       "prop": "addr",
-      "search": true,
+      "search": false,
       "index": 3,
       "width": 100,
       "rules": [
@@ -64,7 +64,7 @@
     {
       "label": "联系人",
       "prop": "attn",
-      "search": true,
+      "search": false,
       "index": 4,
       "width": 100,
       "rules": [{
@@ -76,7 +76,7 @@
     {
       "label": "电话",
       "prop": "tel",
-      "search": true,
+      "search": false,
       "index": 5,
       "width": 100,
       "rules": [{
@@ -88,7 +88,7 @@
     {
       "label": "是否计费",
       "prop": "iffee",
-      "search": true,
+      "search": false,
       "index": 6,
       "width": 100,
       "rules": [{
@@ -100,7 +100,7 @@
     {
       "label": "库容",
       "prop": "storageCapacity",
-      "search": true,
+      "search": false,
       "index": 7,
       "width": 100,
       "rules": [{

src/components/warehouseSelect/index.vue

@@ -131,7 +131,7 @@ export default {
     }
   },
   created() {
-    this.option.searchShow = this.configuration.searchShow ? this.configuration.searchShow : false
+    // this.option.searchShow = this.configuration.searchShow ? this.configuration.searchShow : false
     this.remoteMethod()
   },
   methods: {
@@ -235,7 +235,7 @@ export default {
     },
     // 远程模糊查找
     remoteMethod(query) {
-      if (query !== '') {
+      if (!query) {
         this.loading = true;
         this.queryParams = {
           size: 10,
@@ -253,11 +253,22 @@ export default {
           current: 1
         }
         customerList(this.queryParams).then(res => {
-          this.dicData = res.data.data.records
+          this.dicData = []
+          this.configuration.dicData = this.configuration.dicData.concat(res.data.data.records)
+          // this.configuration.dicData = res.data.data.records
+          this.removeRepeat()
           this.loading = false;
         });
       }
     },
+    // 去重
+    removeRepeat() {
+      let obj = []
+      this.configuration.dicData = this.configuration.dicData.reduce((current,next) => {
+        obj[next.id] ? '': obj[next.id] = true && current.push(next)
+        return current
+      }, [])
+    },
   }
 };
 </script>

src/router/views/index.js

@@ -490,37 +490,53 @@ export default [{
       }
     ]
   },
-  // 收款详情
+  // 付款详情
   {
-    path: '/financialManagement/receipt',
+    path: '/financialManagement/payment',
     component: Layout,
     hidden: true,
     children: [
       {
-        path: '/financialManagement/receipt',
-        name:"收款管理",
+        path: '/financialManagement/payment',
+        name:"付款申请",
         meta: {
-          i18n: '/financialManagement/receipt',
+          i18n: '/financialManagement/payment',
           keepAlive: true,
         },
-        component: () => import( /* webpackChunkName: "views" */ '@/views/financialManagement/receipt')
+        component: () => import( /* webpackChunkName: "views" */ '@/views/financialManagement/payment')
       }
     ]
   },
-  // 付款详情
   {
-    path: '/financialManagement/payment',
+    path: '/financialManagement/settelpayment',
     component: Layout,
     hidden: true,
     children: [
       {
-        path: '/financialManagement/payment',
-        name:"付款管理",
+        path: '/financialManagement/settelpayment',
+        name:"付款结算",
         meta: {
-          i18n: '/financialManagement/payment',
+          i18n: '/financialManagement/settelpayment',
           keepAlive: true,
         },
-        component: () => import( /* webpackChunkName: "views" */ '@/views/financialManagement/payment')
+        component: () => import( /* webpackChunkName: "views" */ '@/views/financialManagement/settelpayment')
+      }
+    ]
+  },
+  // 收款详情
+  {
+    path: '/financialManagement/receipt',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: '/financialManagement/receipt',
+        name:"收款结算",
+        meta: {
+          i18n: '/financialManagement/receipt',
+          keepAlive: true,
+        },
+        component: () => import( /* webpackChunkName: "views" */ '@/views/financialManagement/receipt')
       }
     ]
   },

src/views/financialManagement/paymentDetailsPage.vue

@@ -106,6 +106,7 @@
   import {detailListData } from "@/api/importTrade/purchase";
   import {getSysNo} from "@/api/importTrade/purchase";
   import { getUserInfo } from "@/api/system/user";
+  import { contrastObj,contrastList } from "@/util/contrastData";
   export default {
     name: "paymentDetailsPage",
     props: {
@@ -309,6 +310,8 @@
             },
           ],
         },
+        oldForm:{},
+        oldDataList:[],
       }
     },
     created() {
@@ -320,8 +323,12 @@
         this.id = BigInt(this.detailData.id);//字符串转数字  超长用BigInt
         getDetail(this.id).then(res => {
           this.form = res.data.data;
+          this.oldForm = Object.assign({},res.data.data);
           this.configuration.dicData = res.data.data.customerModel;
-          this.dataList = res.data.data.itemsList
+          if(res.data.data.itemsList){
+            this.dataList = res.data.data.itemsList
+            this.oldDataList = this.deepClone(res.data.data.itemsList)
+          }
         })
       }else{
         this.assignment()
@@ -390,6 +397,13 @@
             }
             editFinance(params).then(res =>{
               if(res.data.success){
+                this.form = res.data.data;
+                this.oldForm = Object.assign({},res.data.data);
+                this.configuration.dicData = res.data.data.customerModel;
+                if(res.data.data.itemsList){
+                  this.dataList = res.data.data.itemsList
+                  this.oldDataList = this.deepClone(res.data.data.itemsList)
+                }
                 this.$message.success("操作成功!")
               }
             })
@@ -399,17 +413,22 @@
           }
         })
       },
-      backToList(){
-        this.$confirm("是否保存当前页面？", "提示", {
-          confirmButtonText: "保存",
-          cancelButtonText: "取消",
-          type: "warning",
-        }).then(() => {
-          this.editFinance(true)
-        }).catch(() => {
+      backToList() {
+        if(contrastObj(this.form,this.oldForm) || contrastList(this.dataList,this.oldDataList)
+        ){
+          this.$confirm("是否保存当前页面？", "提示", {
+            confirmButtonText: "保存",
+            cancelButtonText: "取消",
+            type: "warning",
+          }).then(() => {
+            this.editCustomer(true)
+          }).catch(()=>{
+            this.$emit("goBack");
+          })
+        }else{
           this.$emit("goBack");
-        })
-      }
+        }
+      },
     }
   }
 </script>

src/views/financialManagement/settelpayment.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+    export default {
+        name: "settelpayment"
+    }
+</script>
+
+<style scoped>
+
+</style>

src/views/financialManagement/settelpaymentDetailsPage.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+    export default {
+        name: "settelpaymentDetailsPage"
+    }
+</script>
+
+<style scoped>
+
+</style>

src/views/importTrade/invoice/config/mainList.json

@@ -22,9 +22,14 @@
   "column":[
     {
       "label": "供应商",
-      "prop": "corpsName",
+      "prop": "corpId",
+      "hide": true,
       "search": true,
-      "searchOrder": 1,
+      "searchOrder": 1
+    },
+    {
+      "label": "供应商",
+      "prop": "corpsName",
       "index": 2,
       "width":120
     },
@@ -106,11 +111,19 @@
       "label": "仓库",
       "prop": "storageId",
       "search": true,
+      "hide": true,
       "searchOrder": 8,
       "index": 7,
       "width":150
     },
     {
+      "label": "仓库",
+      "prop": "storageName",
+      "overHidden": true,
+      "index": 7,
+      "width":150
+    },
+    {
       "label": "备注",
       "prop": "deliveryRemarks",
       "search": true,
@@ -128,6 +141,11 @@
       "label": "制单人日期",
       "prop": "createTime",
       "search": true,
+      "type": "date",
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "unlinkPanels": true,
+      "searchRange": true,
       "searchOrder": 9,
       "index": 9,
       "width":120

src/views/importTrade/invoice/detailsPageEdit.vue

@@ -34,6 +34,7 @@
               <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
                 <el-date-picker v-if="item.type === 'datetime'" style="width: 100%;" v-model="form[item.prop]" :disabled="item.disabled?true:false || goodsDisable" size="small" type="date" placeholder="请选择日期" value-format="yyyy-MM-dd HH:mm:ss"/>
                 <selectComponent v-else-if="item.prop === 'corpId'" v-model="form[item.prop]" :configuration="configuration"/>
+<!--                <warehouse-select  v-else-if="item.prop === 'storageId'" v-model="form[item.prop]" :configuration="sConfiguration"></warehouse-select>-->
                 <el-select v-else-if="item.prop === 'storageId'" style="width: 100%" :disabled="item.disabled?true:false || goodsDisable"  @change="warehouseChange" v-model="form[item.prop]" size="small" placeholder="请选择" clearable filterable>
                   <el-option v-for="(item,index) in storageIdDic" :key="index" :label="item.cname" :value="item.id"></el-option>
                 </el-select>
@@ -244,6 +245,8 @@
       <market-detail
         @closeFun="!marketDialog"
         @importMarket="importMarket"
+        @close="closeMarkeDialog"
+        systemType="CK"
       >
       </market-detail>
     </el-dialog>
@@ -300,35 +303,47 @@ export default {
         placeholder:'请点击右边按钮选择',
         dicData:[]
       },
+      sConfiguration:{
+        multipleChoices:false,
+        multiple:false,
+        disabled:false,
+        searchShow:true,
+        collapseTags:false,
+        placeholder:'请点击右边按钮选择',
+        dicData:[]
+      },
       basicData: {
         column: [
           {
             label: '系统号',
             prop: 'sysNo',
             disabled:true,
-          }, {
-            label: '合同号',
-            prop: 'orderNo',
-            disabled:true,
+          },
+          {
+            label: '客户名称',
+            prop: 'corpId',
+            span:16,
+            type:'component',
             rules: [
               {
-                required: false,
+                required: true,
                 message: ' ',
                 trigger: 'blur'
               }
             ]
-          },{
-            label: '客户名称',
-            prop: 'corpId',
-            type:'component',
+          },
+          {
+            label: '合同号',
+            prop: 'orderNo',
+            disabled:true,
             rules: [
               {
-                required: true,
+                required: false,
                 message: ' ',
                 trigger: 'blur'
               }
             ]
-          }, {
+          },{
             label: '仓库名称',
             prop: 'storageId',
             rules: [
@@ -488,6 +503,10 @@ export default {
     }
   },
   methods: {
+    // 关闭导入销售弹窗
+    closeMarkeDialog() {
+      this.marketDialog = false
+    },
     //选择仓库  带出库存
     warehouseChange(){
       this.contactsData.forEach(item =>{

src/views/importTrade/invoice/index.vue

@@ -5,6 +5,7 @@
                ref="crud"
                v-model="form"
                :page.sync="page"
+               :search.sync="search"
                @row-del="rowDel"
                @row-update="rowUpdate"
                :before-open="beforeOpen"
@@ -18,6 +19,18 @@
                @saveColumn="saveColumn"
                @refresh-change="refreshChange"
                @on-load="onLoad">
+      <template slot="corpIdSearch">
+        <select-component
+          v-model="search.corpId"
+          :configuration="configuration"
+        ></select-component>
+      </template>
+      <template slot="storageIdSearch">
+        <warehouse-select
+          v-model="search.storageId"
+          :configuration="sConfiguration"
+        ></warehouse-select>
+      </template>
       <template slot="menuLeft">
         <el-button size="small"
                    type="success"
@@ -85,6 +98,27 @@ export default {
         pageSize: 10,
         pagerCount: 5,
         total: 0,
+      },
+      search: {},
+      configuration:{
+        multipleChoices:false,
+        multiple:false,
+        disabled:false,
+        searchShow:true,
+        collapseTags:false,
+        clearable:true,
+        placeholder:'请点击右边按钮选择',
+        dicData:[]
+      },
+      sConfiguration:{
+        multipleChoices:false,
+        multiple:false,
+        disabled:false,
+        searchShow:true,
+        collapseTags:false,
+        clearable:true,
+        placeholder:'请点击右边按钮选择',
+        dicData:[]
       }
     }
   },

src/views/importTrade/receipt/config/mainList.json

@@ -23,9 +23,15 @@
   "column":[
     {
       "label": "供应商",
-      "prop": "corpsName",
+      "prop": "corpId",
       "search": true,
       "searchOrder": 1,
+      "hide": true
+    },
+    {
+      "label": "供应商",
+      "prop": "corpsName",
+      "overHidden": true,
       "index": 2,
       "width":120
     },
@@ -33,6 +39,7 @@
       "label": "合同号",
       "prop": "orderNo",
       "search": true,
+      "overHidden": true,
       "searchOrder": 2,
       "index": 2,
       "width":120
@@ -41,6 +48,7 @@
       "label": "提单号",
       "prop": "billNo",
       "search": true,
+      "overHidden": true,
       "searchOrder": 3,
       "index": 2,
       "width":120
@@ -49,6 +57,7 @@
       "label": "收货日期",
       "prop": "businessDate",
       "search": true,
+      "overHidden": true,
       "type": "date",
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd",
@@ -83,6 +92,7 @@
       "label": "发货人",
       "prop": "arrivalContact",
       "search": true,
+      "overHidden": true,
       "searchOrder": 5,
       "index": 4,
       "width":120
@@ -91,6 +101,7 @@
       "label": "发货电话",
       "prop": "arrivalTel",
       "search": true,
+      "overHidden": true,
       "searchOrder": 6,
       "index": 4,
       "width":120
@@ -99,6 +110,7 @@
       "label": "发货地址",
       "prop": "arrivalAddress",
       "search": true,
+      "overHidden": true,
       "searchOrder": 7,
       "index": 4,
       "width":120
@@ -107,14 +119,23 @@
       "label": "仓库",
       "prop": "storageId",
       "search": true,
+      "hide": true,
       "searchOrder": 8,
       "index": 7,
       "width":150
     },
     {
+      "label": "仓库",
+      "prop": "storageName",
+      "overHidden": true,
+      "index": 7,
+      "width":150
+    },
+    {
       "label": "备注",
       "prop": "deliveryRemarks",
       "search": true,
+      "overHidden": true,
       "searchOrder": 8,
       "index": 10,
       "width":180
@@ -122,6 +143,7 @@
     {
       "label": "系统编号",
       "prop": "sysNo",
+      "overHidden": true,
       "index": 9,
       "width":120
     },
@@ -129,6 +151,12 @@
       "label": "制单人日期",
       "prop": "createTime",
       "search": true,
+      "type": "date",
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "unlinkPanels": true,
+      "searchRange": true,
+      "overHidden": true,
       "searchOrder": 9,
       "index": 9,
       "width":120
@@ -137,6 +165,7 @@
       "label": "制单人",
       "prop": "createUserName",
       "search": true,
+      "overHidden": true,
       "searchOrder": 10,
       "index": 9,
       "width":120

src/views/importTrade/receipt/detailsPageEdit.vue

@@ -317,34 +317,26 @@ export default {
                 trigger: 'blur'
               }
             ]
-          }, {
-            label: '合同号',
-            prop: 'orderNo',
-            rules: [
-              {
-                required: false,
-                message: ' ',
-                trigger: 'blur'
-              }
-            ]
-          },  {
-            label: '业务员',
-            prop: 'saleman',
+          },
+          {
+            label: '供应商',
+            prop: 'corpId',
+            span: 16,
             dicData: [],
             rules: [
               {
-                required: false,
+                required: true,
                 message: ' ',
                 trigger: 'blur'
               }
             ]
-          },  {
-            label: '供应商',
-            prop: 'corpId',
-            dicData: [],
+          },
+          {
+            label: '合同号',
+            prop: 'orderNo',
             rules: [
               {
-                required: true,
+                required: false,
                 message: ' ',
                 trigger: 'blur'
               }
@@ -375,6 +367,18 @@ export default {
             ]
           },
           {
+            label: '业务员',
+            prop: 'saleman',
+            dicData: [],
+            rules: [
+              {
+                required: false,
+                message: ' ',
+                trigger: 'blur'
+              }
+            ]
+          },
+          {
             label: '码单重量',
             prop: 'billWeight',
             disabled: true,

src/views/importTrade/receipt/index.vue

@@ -5,6 +5,7 @@
                ref="crud"
                v-model="form"
                :page.sync="page"
+               :search.sync="search"
                @row-del="rowDel"
                @row-update="rowUpdate"
                :before-open="beforeOpen"
@@ -18,6 +19,18 @@
                @refresh-change="refreshChange"
                @saveColumn="saveColumn"
                @on-load="onLoad">
+      <template slot="corpIdSearch">
+        <select-component
+          v-model="search.corpId"
+          :configuration="configuration"
+        ></select-component>
+      </template>
+      <template slot="storageIdSearch">
+        <warehouse-select
+          v-model="search.storageId"
+          :configuration="sConfiguration"
+        ></warehouse-select>
+      </template>
       <template slot="menuLeft">
         <el-button size="small"
                    type="success"
@@ -79,6 +92,27 @@ export default {
       show:true,
       detailData:{},
       option: option,
+      search: {},
+      configuration:{
+        multipleChoices:false,
+        multiple:false,
+        disabled:false,
+        searchShow:true,
+        collapseTags:false,
+        clearable:true,
+        placeholder:'请点击右边按钮选择',
+        dicData:[]
+      },
+      sConfiguration:{
+        multipleChoices:false,
+        multiple:false,
+        disabled:false,
+        searchShow:true,
+        collapseTags:false,
+        clearable:true,
+        placeholder:'请点击右边按钮选择',
+        dicData:[]
+      },
       parentId: 0,
       dataList: [],
       page: {
@@ -105,6 +139,18 @@ export default {
       }
     }, 100);
   },
+  mounted() {
+    this.option.height = window.innerHeight - 310;
+    let i = 0;
+    this.option.column.forEach(item => {
+      if (item.search) i++
+    })
+    if (i % 3 !== 0){
+      const num = 3 - Number(i % 3)
+      this.option.searchMenuSpan = num * 8;
+      this.option.searchMenuPosition = "right";
+    }
+  },
   methods: {
     //删除列表后面的删除按钮触发触发(row, index, done)
     rowDel(row, index, done) {

src/views/mallManagement/commodity/productList/detailsPageEdit.vue

@@ -54,6 +54,16 @@
             <el-button
                 size="small"
                 icon="el-icon-close"
+                v-if="row.goodsStatus == '2'"
+                @click="uALowerShelves(row,'upper')"
+                type="text">
+              上架
+            </el-button>
+            <el-button
+                size="small"
+                icon="el-icon-close"
+                v-if="row.goodsStatus == '1'"
+                @click="uALowerShelves(row,'lower')"
                 type="text">
               下架
             </el-button>
@@ -246,8 +256,7 @@ export default {
                 message: " ",
                 trigger: "blur"
               }
-            ],
-            slot: true
+            ]
           },
           {
             label: "排序",
@@ -259,8 +268,7 @@ export default {
                 message: " ",
                 trigger: "blur"
               }
-            ],
-            slot: true
+            ]
           },
           {
             label: "商品名称",
@@ -272,8 +280,7 @@ export default {
                 message: " ",
                 trigger: "blur"
               }
-            ],
-            slot: true
+            ]
           },
           {
             label: "推广词",
@@ -285,8 +292,7 @@ export default {
                 message: " ",
                 trigger: "blur"
               }
-            ],
-            slot: true
+            ]
           }
         ]
       },
@@ -323,6 +329,12 @@ export default {
         this.$refs.goodsCrud.$refs.dialogColumn.columnBox = false;
       }
     },
+    //上下架
+    uALowerShelves(row,type){
+      if (type === 'upper') row.goodsStatus = 1
+      if (type === 'lower') row.goodsStatus = 2
+      this.editProductInfo()
+    },
     //费用查询
     onLoad(page, params = {}) {
       this.loading = true;
@@ -469,6 +481,7 @@ export default {
             if (res.data.success) {
               this.$message.success("操作成功！")
               this.query(this.form.id)
+              console.log(this.option);
             }
           })
         } else {

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

@@ -44,13 +44,18 @@
     {
       "label": "供应商",
       "prop": "strCorpName",
-      "search": true,
       "overHidden": true,
-      "searchOrder": 3,
       "index": 3,
       "width":200
     },
     {
+      "label": "供应商",
+      "prop": "corpId",
+      "search": true,
+      "hide": true,
+      "searchOrder": 3
+    },
+    {
       "label": "采购商",
       "prop": "strPurchaserName",
       "overHidden": true,
@@ -151,20 +156,6 @@
       "index": 14,
       "width":150
     },
-    {
-      "label": "到港日期",
-      "prop": "dateOfArrival",
-      "type": "date",
-      "format": "yyyy-MM-dd",
-      "valueFormat": "yyyy-MM-dd",
-      "unlinkPanels": true,
-      "searchRange": true,
-      "overHidden": true,
-      "search": true,
-      "searchOrder": 9,
-      "index": 15,
-      "width":150
-    },
      {
       "label": "付款/开证日期",
       "prop": "accountsCollectionDate",

src/views/purchase/contract/detailsPage.vue

@@ -476,6 +476,7 @@ export default {
           }, {
             label: '供应商',
             prop: 'corpId',
+            span: 16,
             dicData: [],
             rules: [
               {
@@ -484,24 +485,25 @@ export default {
                 trigger: 'blur'
               }
             ]
-          }, {
-            label: '采购商',
-            prop: 'purchaserId',
-            dicData: [],
+          },{
+            label: '合同号',
+            prop: 'orderNo',
+            disabled:true,
             rules: [
               {
-                required: true,
+                required: false,
                 message: ' ',
                 trigger: 'blur'
               }
             ]
-          },{
-            label: '合同号',
-            prop: 'orderNo',
-            disabled:true,
+          }, {
+            label: '采购商',
+            prop: 'purchaserId',
+            span: 16,
+            dicData: [],
             rules: [
               {
-                required: false,
+                required: true,
                 message: ' ',
                 trigger: 'blur'
               }

src/views/purchase/contract/index.vue

@@ -22,6 +22,12 @@
                  @on-load="onLoad"
                  @expand-change="expandChange"
                  @saveColumn="saveColumn">
+        <template slot="corpIdSearch">
+          <select-component
+            v-model="search.corpId"
+            :configuration="configuration"
+          ></select-component>
+        </template>
         <template slot-scope="scope" slot="expand">
           <el-table :data="scope.row.insideList" v-loading="scope.row.loading">
             <el-table-column   align="center"  width="60"></el-table-column>
@@ -73,7 +79,6 @@
           >删除
           </el-button>
         </template>
-
       </avue-crud>
     </basic-container>
     <detail-page
@@ -105,6 +110,16 @@ export default {
       form: {},
       show: true,
       search: {},
+      configuration:{
+        multipleChoices:false,
+        multiple:false,
+        disabled:false,
+        searchShow:true,
+        collapseTags:false,
+        clearable:true,
+        placeholder:'请点击右边按钮选择',
+        dicData:[]
+      },
     }
   },
   components:{
@@ -115,6 +130,15 @@ export default {
   },
   mounted() {
     this.option.height = window.innerHeight - 310;
+    let i = 0;
+    this.option.column.forEach(item => {
+      if (item.search) i++
+    })
+    if (i % 4 !== 0){
+      const num = 4 - Number(i % 4)
+      this.option.searchMenuSpan = num * 8;
+      this.option.searchMenuPosition = "right";
+    }
   },
   methods: {
     //删除列表后面的删除按钮触发触发(row, index, done)

src/views/salesManagement/salesContract/config/mainList.json

@@ -46,15 +46,25 @@
       "label": "客户名称",
       "prop": "corpsName",
       "overHidden": true,
-      "search": true,
-      "searchOrder": 3,
       "index": 3,
       "width":150
     },
     {
+      "label": "客户名称",
+      "prop": "corpId",
+      "hide": true,
+      "search": true,
+      "searchOrder": 3
+    },
+    {
       "label": "合同日期",
       "prop": "businesDate",
       "overHidden": true,
+      "type": "date",
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "unlinkPanels": true,
+      "searchRange": true,
       "search": true,
       "searchOrder": 4,
       "index": 4,
@@ -115,6 +125,11 @@
       "label": "客户首付日期",
       "prop": "advanceCollectionDate",
       "overHidden": true,
+      "type": "date",
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "unlinkPanels": true,
+      "searchRange": true,
       "search": true,
       "searchOrder": 6,
       "index": 12,

src/views/salesManagement/salesContract/detailsPage.vue

@@ -340,7 +340,20 @@ export default {
                 trigger: 'blur'
               }
             ]
-          }, {
+          },
+          {
+            label: '客户名称',
+            span:16,
+            prop: 'corpId',
+            rules: [
+              {
+                required: true,
+                message: ' ',
+                trigger: 'blur'
+              }
+            ]
+          },
+          {
             label: '合同号',
             prop: 'orderNo',
             disabled:true,
@@ -363,17 +376,8 @@ export default {
                 trigger: 'blur'
               }
             ]
-          },  {
-            label: '客户名称',
-            prop: 'corpId',
-            rules: [
-              {
-                required: true,
-                message: ' ',
-                trigger: 'blur'
-              }
-            ]
-          },{
+          },
+          {
             label: '业务员',
             prop: 'salesName',
             dicData: [],

src/views/salesManagement/salesContract/index.vue

@@ -5,6 +5,7 @@
                ref="crud"
                v-model="form"
                :page.sync="page"
+               :search.sync="search"
                @row-del="rowDel"
                @row-update="rowUpdate"
                :before-open="beforeOpen"
@@ -19,6 +20,12 @@
                @on-load="onLoad"
                @expand-change="expandChange"
                @saveColumn="saveColumn">
+      <template slot="corpIdSearch">
+        <select-component
+          v-model="search.corpId"
+          :configuration="configuration"
+        ></select-component>
+      </template>
       <template slot-scope="{row,size}" slot="search">
       </template>
       <template slot-scope="scope" slot="expand">
@@ -102,6 +109,16 @@ export default {
       form: {},
       detailData:{},
       search: {},
+      configuration:{
+        multipleChoices:false,
+        multiple:false,
+        disabled:false,
+        searchShow:true,
+        collapseTags:false,
+        clearable:true,
+        placeholder:'请点击右边按钮选择',
+        dicData:[]
+      },
     }
   },
   components:{

src/views/workManagement/main-items/configuration/detailsPage.json

@@ -10,7 +10,7 @@
   "addBtn": false,
   "viewBtn": false,
   "editBtn": false,
-  "delBtn": true,
+  "delBtn": false,
   "selection": true,
   "refreshBtn": false,
   "menuWidth": 220,

src/views/workManagement/main-items/configuration/mainList.json

@@ -8,7 +8,7 @@
   "tip": false,
   "searchShow": true,
   "searchMenuPosition": "right",
-  "searchMenuSpan": 24,
+  "searchMenuSpan": 18,
   "tree": true,
   "selection": false,
   "editBtn": false,
@@ -17,13 +17,6 @@
   "menuWidth": 220,
   "column": [
     {
-      "label": "系统编号",
-      "prop": "sysNo",
-      "index": 1,
-      "width": 120,
-      "overHidden": true
-    },
-    {
       "label": "项目编码",
       "prop": "code",
       "search": true,
@@ -41,13 +34,18 @@
     },
     {
       "label": "客户名称",
-      "prop": "corpId",
-      "hide": true,
+      "prop": "corpNames",
       "index": 4,
       "width": 120,
       "overHidden": true
     },
     {
+      "label": "客户名称",
+      "prop": "corpId",
+      "search": true,
+      "hide": true
+    },
+    {
       "label": "应收金额",
       "prop": "debitAmount",
       "index": 5,

src/views/workManagement/main-items/detailsPage.vue

@@ -86,6 +86,12 @@
               @click="rowCellTwo(row,index)"
               :disabled="row.strStatus !== '录入'"
             >{{row.$cellEdit?'修改完成':'修改'}}</el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click="rowDel(row,index)"
+              :disabled="row.strStatus == '结算完成'"
+            >删除</el-button>
           </template>
           <template slot="userid" slot-scope="{row,index}">
             <span v-if="row.$cellEdit" style="float: left;color: #F56C6C;">*</span>
@@ -242,7 +248,7 @@
 <script>
   import option from "./configuration/detailsPage.json";
   import startOption from "./configuration/startDialog.json";
-  import { projectDetail,editMianProject,updateItemStatus,getSysNo } from "@/api/workManagement/mainProject";
+  import { projectDetail,editMianProject,updateItemStatus,getSysNo,getPidByItemId} from "@/api/workManagement/mainProject";
   //上传文件json
   import upLoadOption from "../../exportTrade/purchaseContract/config/uploadList.json"
   //服务列表接口
@@ -581,8 +587,16 @@
       this.$set(this.form,"advanceAmount",0)
       this.$set(this.form,"settlmentAmount",0)
       this.$set(this.form,"balanceAmount",0)
-      this.id = BigInt(this.$route.query.id);//字符串转数字  超长用BigInt
-      this.getProjectDetail();
+      if(this.$route.query.id){
+        this.id = BigInt(this.$route.query.id);//字符串转数字  超长用BigInt
+        this.getProjectDetail();
+      }
+      if(this.$route.query.itemId){
+        getPidByItemId(this.$route.query.itemId).then((res)=>{
+          this.id =  res.data.data;
+          this.getProjectDetail();
+        })
+      }
       const params = {
         code : "affair_payment_term"
       }
@@ -642,15 +656,15 @@
             this.form = res.data.data;
             this.oldForm = Object.assign({},res.data.data);
             this.configuration.dicData = res.data.data.corpName; //给客户名称赋值
-            if(res.data.data.filesList){
-              this.upLoadData = res.data.data.filesList
-              this.oldUpLoadData = this.deepClone(res.data.data.filesList)
-            }
             if(res.data.data.itemList){
               this.operationDetailList(res.data.data.itemList);
             }else{
               this.data = [];
             }
+            if(res.data.data.filesList){
+              this.upLoadData = res.data.data.filesList
+              this.oldUpLoadData = this.deepClone(res.data.data.filesList)
+            }
           })
         }else{
           getSysNo().then(res =>{
@@ -673,24 +687,31 @@
         })
         //如果 明细列表存在 请核之后的状态 禁止编辑一些输入框
         if(status.findIndex(item => item == false) == 0){
+          console.log(1)
           this.basicData.column.forEach(item =>{
             if(item.prop == "code" || item.prop == "cname" || item.prop == "corpId" || item.prop == "debitAmount"){
               item.disabled = true
               this.configuration.disabled = true
             }
           })
+        }else{
+          console.log(2)
+          this.basicData.column.forEach(item =>{
+            if(item.prop == "code" || item.prop == "cname" || item.prop == "corpId" || item.prop == "debitAmount"){
+              item.disabled = false
+              this.configuration.disabled = false
+            }
+          })
         }
       },
       //删除列表后面的删除按钮触发触发(row, index, done)
-      rowDel(row, index, done) {
+      rowDel(row, index) {
         this.$confirm("确定将此明细删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
-          this.data.splice(index,0)
-          // 数据回调进行刷新
-          done(row);
+          this.data.splice(index,1)
         });
       },
       // 合同金额
@@ -785,7 +806,7 @@
           let valids = true;
           if(this.data.length !=0){
             this.data.forEach((item) =>{
-              if((item.userid ==""  || !item.deptid || !item.amount) && valids){
+              if((item.userid ==""  || !item.deptid) && valids){
                 this.$message({
                   type: "warning",
                   message: "请检查明细列表第 "+(item.$index +1 )+" 行必填项"

src/views/workManagement/main-items/list.vue

@@ -5,6 +5,7 @@
       :data="data"
       :option="optionTable"
       :page.sync="page"
+      :search.sync="search"
       :table-loading="loading"
       @row-del="rowDel"
       @row-update="rowUpdate"
@@ -14,6 +15,12 @@
       @on-load="getList"
       @saveColumn="saveColumn"
     >
+      <template slot="corpIdSearch">
+        <select-component
+          v-model="search.corpId"
+          :configuration="configuration"
+        ></select-component>
+      </template>
       <template slot="menuLeft">
         <el-button type="primary"
                    size="small"
@@ -62,6 +69,17 @@ export default {
       switchDialog:false,
       loading: false,
       data: [],
+      search:{},
+      configuration:{
+        multipleChoices:false,
+        multiple:false,
+        disabled:false,
+        searchShow:true,
+        collapseTags:false,
+        clearable:true,
+        placeholder:'请点击右边按钮选择',
+        dicData:[]
+      },
       optionTable: option,
       page: {
         currentPage: 1,

src/views/workManagement/receipt/configuration/settleAccounts.json

@@ -54,8 +54,15 @@
     },
     {
       "label": "客户名称",
-      "prop": "cornName",
+      "prop": "corpNames",
       "overHidden": true,
+      "index": 4,
+      "width": 120
+    },
+    {
+      "label": "客户名称",
+      "prop": "corpId",
+      "hide": true,
       "search": true,
       "index": 4,
       "width": 120

src/views/workManagement/receipt/configuration/statisticalList.json

@@ -9,9 +9,9 @@
   "searchShow": true,
   "searchMenuPosition": "right",
   "tree": true,
-  "searchMenuSpan": 18,
+  "searchMenuSpan": 12,
   "selection": false,
-  "viewBtn": true,
+  "viewBtn": false,
   "editBtn": false,
   "delBtn": false,
   "menuWidth": 150,
@@ -57,7 +57,7 @@
       "prop": "status",
       "type": "select",
       "search": true,
-      "searchOrder": 5,
+      "searchOrder": 6,
       "overHidden": true,
       "dicData": [
         {
@@ -100,7 +100,7 @@
     {
       "label": "服务项目",
       "prop": "pname",
-      "searchOrder": 2,
+      "searchOrder": 5,
       "search": true,
       "overHidden": true,
       "width": 120
@@ -108,6 +108,8 @@
     {
       "label": "承做人",
       "prop": "userName",
+      "search": true,
+      "searchOrder": 2,
       "overHidden": true,
       "width": 120
     },

src/views/workManagement/receipt/settleAccounts.vue

@@ -5,6 +5,7 @@
       :data="data"
       :option="option"
       :page.sync="page"
+      :search.sync="search"
       :table-loading="loading"
       @row-del="rowDel"
       @size-change="sizeChange"
@@ -14,6 +15,12 @@
       @on-load="getList"
       @saveColumn="saveColumn"
     >
+      <template slot="corpIdSearch">
+        <select-component
+          v-model="search.corpId"
+          :configuration="configuration"
+        ></select-component>
+      </template>
       <template slot-scope="{row,index}" slot="menuLeft">
         <el-button
           icon="el-icon-printer"
@@ -24,7 +31,6 @@
         </el-button>
       </template>
       <template slot-scope="scope" slot="menu">
-
         <el-button
           type="text"
           icon="el-icon-edit"
@@ -47,6 +53,17 @@
         loading: false,
         data: [],
         option: option,
+        search:{},
+        configuration:{
+          multipleChoices:false,
+          multiple:false,
+          disabled:false,
+          searchShow:true,
+          collapseTags:false,
+          clearable:true,
+          placeholder:'请点击右边按钮选择',
+          dicData:[]
+        },
         page: {
           currentPage: 1,
           total: 0,

src/views/workManagement/receipt/statisticalList.vue

@@ -29,8 +29,14 @@
           :configuration="configuration"
         ></select-component>
       </template>
-
-
+      <template slot-scope="scope" slot="menu">
+        <el-button
+          type="text"
+          size="small"
+          @click.stop="check(scope.row, scope.index)"
+        >查 看
+        </el-button>
+      </template>
     </avue-crud>
   </basic-container>
 </template>
@@ -85,6 +91,12 @@
       rowSave() {
 
       },
+      check(row,index){
+        this.$router.push({
+          path: "/mainItems_detailsPage",
+          query: { itemId: row.id }
+        });
+      },
       //点击搜索按钮触发
       searchChange(params, done) {
         this.onLoad(this.page, params);

src/views/workManagement/task/configuration/mainList.json

@@ -7,7 +7,7 @@
   "tip": false,
   "searchShow": true,
   "searchMenuPosition": "right",
-  "searchMenuSpan": 18,
+  "searchMenuSpan": 24,
   "tree": true,
   "selection": false,
   "addBtn": false,
@@ -15,7 +15,7 @@
   "editBtn": false,
   "delBtn": false,
   "menuWidth": 150,
-  "searchLabelWidth": 130,
+  "searchLabelWidth": 100,
   "column": [
     {
       "label": "状态",
@@ -26,6 +26,10 @@
       "type": "select",
       "dicData": [
         {
+          "label": "已审核",
+          "value": "1"
+        },
+        {
           "label": "正在结算",
           "value": "4"
         },
@@ -46,22 +50,19 @@
     {
       "label": "客户名称",
       "overHidden": true,
-      "search": true,
       "prop": "cornName",
-      "searchOrder": 1,
       "width": 220
     },
     {
-      "label": "服务项目",
-      "prop": "pname",
-      "overHidden": true,
-      "width": 120
+      "label": "客户名称",
+      "hide": true,
+      "search": true,
+      "prop": "cornId",
+      "searchOrder": 1
     },
     {
-      "label": "承做人",
-      "prop": "userName",
-      "search": true,
-      "searchOrder": 2,
+      "label": "服务项目",
+      "prop": "pname",
       "overHidden": true,
       "width": 120
     },

src/views/workManagement/task/index.vue

@@ -5,6 +5,7 @@
                ref="crud"
                v-model="form"
                :page.sync="page"
+               :search.sync="search"
                :table-loading="loading"
                @search-change="searchChange"
                @search-reset="searchReset"
@@ -13,6 +14,12 @@
                @size-change="sizeChange"
                @refresh-change="refreshChange"
                @on-load="onLoad">
+      <template slot="cornIdSearch">
+        <select-component
+          v-model="search.cornId"
+          :configuration="configuration"
+        ></select-component>
+      </template>
       <template slot="menuLeft">
         <el-button
           icon="el-icon-printer"
@@ -53,6 +60,17 @@
       return {
         loading : false,
         form: {},
+        search:{},
+        configuration:{
+          multipleChoices:false,
+          multiple:false,
+          disabled:false,
+          searchShow:true,
+          collapseTags:false,
+          clearable:true,
+          placeholder:'请点击右边按钮选择',
+          dicData:[]
+        },
         option: option,
         parentId:0,
         dataList: [],