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

src/components/finance/applyPayment.vue

@@ -169,7 +169,7 @@ export default {
             ]
           },
           {
-            label: this.billData.optionType === "JK" ? '合同日期' : "订单日期",
+            label: this.billType === "收费"?'退款日期':this.billData.optionType === "JK" ? '合同日期' : "订单日期",
             type: "date",
             prop: 'accDate',
             span: 8,

src/router/views/index.js

@@ -153,12 +153,12 @@ export default [{
     hidden: true,
     children: [
       {
-        path: '/productInfo_detailsPageEdit',
-        name:'产品详情',
+        path: '/basicData/productInformation/index',
+        name:'产品信息',
         meta: {
-          i18n: 'productInfo_detailsPageEdit'
+          i18n: 'basicData/productInformation/index'
         },
-        component: () => import( /* webpackChunkName: "views" */ '@/views/basicData/productInformation/detailsPageEdit')
+        component: () => import( /* webpackChunkName: "views" */ '@/views/basicData/productInformation/index')
       }
     ]
   },

src/views/basicData/productInformation/detailsPageEdit.vue

@@ -73,6 +73,9 @@ import {
 } from "@/api/basicData/commodityType";
 
 export default {
+  props:{
+    detailData:Object
+  },
   name: "detailsPage",
   data() {
     return {
@@ -286,15 +289,21 @@ export default {
     getDeptTree().then(res => {
       this.dicData = res.data.data;
     });
-    if (this.$route.query.id) {
-      getDetail(JSON.parse(this.$route.query.id)).then(res => {
-        this.form = res.data.data;
-      });
+    if (this.detailData.id) {
+      this.queryData(this.detailData.id)
     } else {
       this.$set(this.form, "goodsTypeId", this.$route.query.treeDeptId);
     }
   },
   methods: {
+    queryData(id) {
+      this.openFullScreen(false, '正在努力的加载...');
+      getDetail(id).then(res => {
+        this.form = res.data.data;
+      }).finally(() => {
+        this.openFullScreen(true);
+      });
+    },
     addSftRow() {
       this.sftData.push({
         $cellEdit: true,
@@ -325,10 +334,13 @@ export default {
             ...this.form,
             type: 0
           };
+          this.openFullScreen(false, '正在努力的加载...');
           updateDetail(params).then(res => {
             if (res.data.success) {
               this.$message.success("操作成功！");
             }
+            this.form = res.data.data
+            this.queryData(res.data.data.id)
           });
         } else {
           return false;
@@ -337,12 +349,18 @@ export default {
     },
     //返回列表
     backToList() {
-      this.$router.$avueRouter.closeTag();
-      this.$router.push({
-        path: "/basicData/productInformation/index",
-        query: {}
+      this.$emit("goBack");
+    },
+    //遮罩层
+    openFullScreen(res, text) {
+      const loading = this.$loading({
+        lock: true,
+        text: text,
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
       });
-    }
+      if (res === true) loading.close();
+    },
   }
 };
 </script>
@@ -355,7 +373,7 @@ export default {
 }
 
 ::v-deep .el-form-item {
-  margin-bottom: 0;
+  margin-bottom: 8px;
 }
 
 .el-dialogDeep {

src/views/basicData/productInformation/index.vue

@@ -1,96 +1,105 @@
 <template>
-  <el-row>
-    <el-col :span="5">
-      <basic-container>
-        <avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick"/>
-      </basic-container>
-    </el-col>
-    <el-col :span="19">
-      <basic-container>
-        <avue-crud :option="option"
-                   :search.sync="search"
-                   :table-loading="loading"
-                   :data="data"
-                   ref="crud"
-                   v-model="form"
-                   @row-del="rowDel"
-                   @row-update="rowUpdate"
-                   @row-save="rowSave"
-                   :before-open="beforeOpenE"
-                   :page.sync="page"
-                   @search-change="searchChange"
-                   @search-reset="searchReset"
-                   @selection-change="selectionChange"
-                   @current-change="currentChange"
-                   @size-change="sizeChange"
-                   @refresh-change="refreshChange"
-                   @on-load="onLoad">
-          <template slot="menuLeft">
-            <el-button
-              type="primary"
-              size="small"
-              icon="el-icon-bottom"
-              @click="excelBox = true"
-            >导入
-            </el-button>
-            <el-button
-              type="warning"
-              size="small"
-              :disabled="selectionList.length==0"
-              icon="el-icon-delete"
-              @click="batchDelete"
-            >批量删除
-            </el-button>
-          </template>
-          <template slot-scope="scope" slot="corpId">
-            <span>{{ scope.row.corpName }}</span>
-          </template>
-          <template slot-scope="scope" slot="menu">
-<!--            <el-button-->
-<!--                type="text"-->
-<!--                icon="el-icon-view"-->
-<!--                size="small"-->
-<!--                @click.stop="beforeOpenPage(scope.row, scope.index)"-->
-<!--            >查看-->
-<!--            </el-button>-->
-            <el-button
+  <div>
+    <el-row v-if="isShow">
+      <el-col :span="5">
+        <basic-container>
+          <avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick"/>
+        </basic-container>
+      </el-col>
+      <el-col :span="19">
+        <basic-container>
+          <avue-crud :option="option"
+                     :search.sync="search"
+                     :table-loading="loading"
+                     :data="data"
+                     ref="crud"
+                     v-model="form"
+                     @row-del="rowDel"
+                     @row-update="rowUpdate"
+                     @row-save="rowSave"
+                     :before-open="beforeOpenE"
+                     :page.sync="page"
+                     @search-change="searchChange"
+                     @search-reset="searchReset"
+                     @selection-change="selectionChange"
+                     @current-change="currentChange"
+                     @size-change="sizeChange"
+                     @refresh-change="refreshChange"
+                     @on-load="onLoad">
+            <template slot="menuLeft">
+              <el-button
+                type="primary"
+                size="small"
+                icon="el-icon-bottom"
+                @click="excelBox = true"
+              >导入
+              </el-button>
+              <el-button
+                type="warning"
+                size="small"
+                :disabled="selectionList.length==0"
+                icon="el-icon-delete"
+                @click="batchDelete"
+              >批量删除
+              </el-button>
+            </template>
+            <template slot-scope="scope" slot="corpId">
+              <span>{{ scope.row.corpName }}</span>
+            </template>
+            <template slot-scope="scope" slot="menu">
+              <!--            <el-button-->
+              <!--                type="text"-->
+              <!--                icon="el-icon-view"-->
+              <!--                size="small"-->
+              <!--                @click.stop="beforeOpenPage(scope.row, scope.index)"-->
+              <!--            >查看-->
+              <!--            </el-button>-->
+              <el-button
                 type="text"
                 icon="el-icon-edit"
                 size="small"
                 @click.stop="editOpen(scope.row, scope.index)"
-            >编辑
-            </el-button>
-            <el-button
+              >编辑
+              </el-button>
+              <el-button
                 type="text"
                 icon="el-icon-delete"
                 size="small"
                 @click.stop="rowDel(scope.row, scope.index)"
-            >删除
-            </el-button>
-<!--            <el-button-->
-<!--                type="text"-->
-<!--                icon="el-icon-delete"-->
-<!--                size="small"-->
-<!--            >下架-->
-<!--            </el-button>-->
-          </template>
-        </avue-crud>
-        <el-dialog title="导入产品"
-                   append-to-body
-                   :visible.sync="excelBox"
-                   width="555px">
-          <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
-            <template slot="excelTemplate">
-              <el-button type="primary" @click="derivation">
-                点击下载<i class="el-icon-download el-icon--right"></i>
+              >删除
               </el-button>
+              <!--            <el-button-->
+              <!--                type="text"-->
+              <!--                icon="el-icon-delete"-->
+              <!--                size="small"-->
+              <!--            >下架-->
+              <!--            </el-button>-->
             </template>
-          </avue-form>
-          <p style="text-align: center;color: #DC0505">温馨提示  第一次导入时请先下载模板</p>
-        </el-dialog>
-      </basic-container>
-    </el-col>
-  </el-row>
+          </avue-crud>
+          <el-dialog title="导入产品"
+                     append-to-body
+                     :visible.sync="excelBox"
+                     width="555px">
+            <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
+              <template slot="excelTemplate">
+                <el-button type="primary" @click="derivation">
+                  点击下载<i class="el-icon-download el-icon--right"></i>
+                </el-button>
+              </template>
+            </avue-form>
+            <p style="text-align: center;color: #DC0505">温馨提示  第一次导入时请先下载模板</p>
+          </el-dialog>
+        </basic-container>
+      </el-col>
+    </el-row>
+
+    <detail-page
+      ref="detail"
+      @goBack="goBack"
+      :detailData="detailData"
+      v-else
+    ></detail-page>
+  </div>
 </template>
 <script>
 import {getList, getUser, getUserPlatform, remove, updatePlatform, add, grant, getDeptLazyTree, getDeptTree} from "@/api/basicData/commodityType";
@@ -99,7 +108,12 @@ import {mapGetters} from "vuex";
 import website from '@/config/website';
 import {getToken} from '@/util/auth';
 import option from "./configuration/mainList.json";
+import detailPage from "./detailsPageEdit";
+
 export default {
+  components: {
+    detailPage
+  },
   data() {
     return {
       form: {},
@@ -189,7 +203,9 @@ export default {
             action: "/api/blade-client/goodsdesc/import-desc-info",
           },
         ]
-      }
+      },
+      isShow: true,
+      detailData: {},
     };
   },
   methods: {
@@ -275,24 +291,25 @@ export default {
     },
     //查看跳转页面
     beforeOpenPage(row, index) {
-      this.$router.push({
-        path: "/productInfo_detailsPageEdit",
-        query: { id: JSON.stringify(row.id) }
-      });
+      this.detailData = {
+        id: row.id,
+        seeDisabled: true,
+      };
+      this.isShow = false;
     },
     //新增跳转页面
     beforeOpenE(row, index) {
-      this.$router.push({
-        path: "/productInfo_detailsPageEdit",
-        query: { id: JSON.stringify(row.id),treeDeptId:this.treeDeptId }
-      });
+      this.detailData = {
+        id: row.id,
+      };
+      this.isShow = false;
     },
     //编辑跳转页面
     editOpen(row, index) {
-      this.$router.push({
-        path: "/productInfo_detailsPageEdit",
-        query: { id: JSON.stringify(row.id) }
-      });
+      this.detailData = {
+        id: row.id,
+      };
+      this.isShow = false;
     },
     //删除触发
     rowDel(row, index, done) {
@@ -454,7 +471,11 @@ export default {
         this.platformLoading = false;
         this.selectionClear();
       });
-    }
+    },
+    goBack() {
+      this.detailData=this.$options.data().detailData
+      this.isShow = true;
+    },
   }
 };
 </script>

src/views/financialManagement/paymentRequest/configuration/mainList.json

@@ -14,7 +14,7 @@
   "viewBtn": false,
   "editBtn": false,
   "delBtn": false,
-  "menuWidth": 180,
+  "menuWidth": 130,
   "dialogClickModal": false,
   "searchLabelWidth": 120,
   "searchIcon": true,

src/views/financialManagement/paymentSettle/configuration/mainList.json

@@ -14,7 +14,7 @@
   "viewBtn": false,
   "editBtn": false,
   "delBtn": false,
-  "menuWidth": 180,
+  "menuWidth": 130,
   "dialogClickModal": false,
   "searchLabelWidth": 120,
   "searchIcon": true,

src/views/financialManagement/receiptSettle/configuration/mainList.json

@@ -14,7 +14,7 @@
   "viewBtn": false,
   "editBtn": false,
   "delBtn": false,
-  "menuWidth": 220,
+  "menuWidth": 130,
   "dialogClickModal": false,
   "searchLabelWidth": 120,
   "searchIcon": true,

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

@@ -15,7 +15,7 @@
   "viewBtn": false,
   "editBtn": false,
   "delBtn": false,
-  "menuWidth": 180,
+  "menuWidth": 150,
   "dialogClickModal": false,
   "searchLabelWidth": 120,
   "searchIcon": true,

src/views/purchase/contract/detailsPage.vue

@@ -659,7 +659,7 @@ export default {
           },
           {
             label: '最迟付款日期',
-            prop: 'LatestDate',
+            prop: 'latestDate',
             type:'date',
             rules: [
               {
@@ -745,28 +745,7 @@ export default {
       let id = this.detailData.id.replace(/\"/g, "")
       detailListData(id).then(res => {
         this.form = res.data.data;
-        this.oldForm = Object.assign({},res.data.data);
-        this.configuration.dicData = this.form.corpsName
-        this.pConfiguration.dicData = this.form.purchaserName
-        if(res.data.data.itemsVOList){
-          this.contactsData = res.data.data.itemsVOList
-          this.oldContactsData = this.deepClone(res.data.data.itemsVOList)
-          //明细列表内是否有 已经收货的 如果有  则禁用一些输入框
-          this.takeDisabled = this.contactsData.map(item =>{if(item.actualQuantity != 0) return true}).some(item => {return item == true})
-          this.basicData.column.forEach(item =>{
-            if(item.prop == "businesDate" || item.prop == "requiredDeliveryDate"  || item.prop == "requiredArrivalDate" || item.prop == ""){
-              item.disabled = this.takeDisabled
-            }
-          })
-        }
-        if(res.data.data.orderFeesList){
-          this.orderFeesList = res.data.data.orderFeesList
-          this.oldFeesList = this.deepClone(res.data.data.orderFeesList)
-        }
-        if( res.data.data.orderFilesList){
-          this.orderFilesList = res.data.data.orderFilesList
-          this.oldFilesList = this.deepClone(res.data.data.orderFilesList)
-        }
+        this.afterEcho(res.data.data)
       }).finally(()=>{
         this.buttonLoading = false;
       })
@@ -898,21 +877,7 @@ export default {
               this.$message.success("操作成功！")
               detailListData(this.form.id).then(res => {
                 this.form = res.data.data;
-                this.oldForm = Object.assign({},res.data.data);
-                this.configuration.dicData = this.form.corpsName
-                this.pConfiguration.dicData = this.form.purchaserName
-                if(res.data.data.itemsVOList){
-                  this.contactsData = res.data.data.itemsVOList
-                  this.oldContactsData = this.deepClone(res.data.data.itemsVOList)
-                }
-                if(res.data.data.orderFeesList){
-                  this.orderFeesList = res.data.data.orderFeesList
-                  this.oldFeesList = this.deepClone(res.data.data.orderFeesList)
-                }
-                if( res.data.data.orderFilesList){
-                  this.orderFilesList = res.data.data.orderFilesList
-                  this.oldFilesList = this.deepClone(res.data.data.orderFilesList)
-                }
+                this.afterEcho(res.data.data)
               })
             }
           }).finally(()=>{
@@ -926,6 +891,31 @@ export default {
         }
       });
     },
+    //回调
+    afterEcho(form){
+      this.oldForm = Object.assign({},form);
+      this.configuration.dicData = this.form.corpsName
+      this.pConfiguration.dicData = this.form.purchaserName
+      if(form.itemsVOList){
+        this.contactsData = form.itemsVOList
+        this.oldContactsData = this.deepClone(form.itemsVOList)
+        //明细列表内是否有 已经收货的 如果有  则禁用一些输入框
+        this.takeDisabled = this.contactsData.map(item =>{if(item.actualQuantity != 0) return true}).some(item => {return item == true})
+        this.basicData.column.forEach(item =>{
+          if(item.prop == "businesDate" || item.prop == "requiredDeliveryDate"  || item.prop == "requiredArrivalDate" || item.prop == "latestDate"  || item.prop == ""){
+            item.disabled = this.takeDisabled
+          }
+        })
+      }
+      if(form.orderFeesList){
+        this.orderFeesList = form.orderFeesList
+        this.oldFeesList = this.deepClone(form.orderFeesList)
+      }
+      if( form.orderFilesList){
+        this.orderFilesList = form.orderFilesList
+        this.oldFilesList = this.deepClone(form.orderFilesList)
+      }
+    },
     selectionContact(row){
       this.selectContact = row;
     },
@@ -1005,7 +995,7 @@ export default {
         price:this.form.salesPrice,
         corpsName:this.form.corpsName,
         corpId:this.form.corpId,
-        accDate:this.form.businesDate,
+        // accDate:this.billType:   this.form.businesDate,
         currency:this.form.currency,
         exchangeRate:this.form.exchangeRate,
         srcParentId:this.form.id,

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

@@ -70,88 +70,88 @@
       "width": 150
     },
     {
-      "label": "货物名称",
-      "search": true,
+      "label": "可用库存",
+      "prop": "surplusRouteQuantity",
       "overHidden": true,
       "index": 3,
-      "width": 220,
-      "prop": "cname"
-    },
-    {
-      "label": "箱号",
-      "prop": "cntrNo",
-      "index": 4,
-      "overHidden": true,
       "width": 120
     },
     {
-      "label": "仓库",
-      "prop": "stockName",
-      "index": 4,
+      "label": "入库件数",
+      "prop": "inQuantity",
       "overHidden": true,
+      "index": 4,
       "width": 120
     },
     {
-      "label": "采购日期",
-      "search": true,
-      "prop": "createTime",
-      "format": "yyyy-MM-dd",
-      "valueFormat": "yyyy-MM-dd",
-      "type": "date",
-      "unlinkPanels": true,
-      "searchRange": true,
+      "label": "入库发票重量",
+      "prop": "inWeight",
       "overHidden": true,
       "index": 5,
-      "width": 150
+      "width": 120
     },
     {
-      "label": "可用库存",
-      "prop": "surplusRouteQuantity",
+      "label": "出库件数",
+      "prop": "outQuantity",
       "overHidden": true,
       "index": 6,
       "width": 120
     },
     {
-      "label": "入库件数",
-      "prop": "inQuantity",
+      "label": "出库发票重量",
+      "prop": "outWeight",
       "overHidden": true,
-      "index": 6,
+      "index": 7,
       "width": 120
     },
     {
-      "label": "入库发票重量",
-      "prop": "inWeight",
+      "label": "结余件数",
+      "prop": "balanceQuantity",
       "overHidden": true,
-      "index": 7,
+      "index": 8,
       "width": 120
     },
     {
-      "label": "出库件数",
-      "prop": "outQuantity",
+      "label": "结余重量",
+      "prop": "balanceWeight",
       "overHidden": true,
       "index": 9,
       "width": 120
     },
     {
-      "label": "出库发票重量",
-      "prop": "outWeight",
+      "label": "货物名称",
+      "search": true,
       "overHidden": true,
       "index": 10,
-      "width": 120
+      "width": 220,
+      "prop": "cname"
     },
     {
-      "label": "结余件数",
-      "prop": "balanceQuantity",
+      "label": "箱号",
+      "prop": "cntrNo",
+      "index": 11,
       "overHidden": true,
+      "width": 120
+    },
+    {
+      "label": "仓库",
+      "prop": "stockName",
       "index": 12,
+      "overHidden": true,
       "width": 120
     },
     {
-      "label": "结余重量",
-      "prop": "balanceWeight",
+      "label": "采购日期",
+      "search": true,
+      "prop": "createTime",
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "type": "date",
+      "unlinkPanels": true,
+      "searchRange": true,
       "overHidden": true,
       "index": 13,
-      "width": 120
+      "width": 150
     }
   ]
 }

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

@@ -18,7 +18,7 @@
   "viewBtn": false,
   "delBtn": false,
   "showSummary": true,
-  "menuWidth": 220,
+  "menuWidth": 120,
   "column": [
     {
       "label": "客户名称",
@@ -38,7 +38,7 @@
       "label": "客户名称",
       "prop": "corpNames",
       "index": 4,
-      "width": 120,
+      "width": 180,
       "overHidden": true
     },
     {
@@ -81,7 +81,7 @@
       "label": "制单人",
       "prop": "createUserName",
       "index": 11,
-      "width": 120,
+      "width": 130,
       "overHidden": true
     },
     {
@@ -102,7 +102,7 @@
       "prop": "updateUserName",
       "index": 13,
       "overHidden": true,
-      "width": 120
+      "width": 130
     },
     {
       "label": "最新修改时间",

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

@@ -125,6 +125,13 @@ export default {
       this.show = false;
       this.$store.commit("MAIN_IN_DETAIL");
     }
+    getUserList().then(res=>{
+      res.data.data.map((item,index)=>{
+        if(index <= 20){
+          this.options.push(item)
+        }
+      })
+    })
   },
   mounted() {
 

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

@@ -17,7 +17,7 @@
   "editBtn": false,
   "viewBtn": false,
   "delBtn": false,
-  "menuWidth": 220,
+  "menuWidth": 80,
   "showSummary": true,
   "summaryText": "合计",
   "sumColumnList": [
@@ -52,7 +52,7 @@
       "prop": "corpNames",
       "overHidden": true,
       "index": 4,
-      "width": 120
+      "width": 180
     },
     {
       "label": "客户名称",

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

@@ -17,7 +17,7 @@
   "viewBtn": false,
   "editBtn": false,
   "delBtn": false,
-  "menuWidth": 150,
+  "menuWidth": 80,
   "showSummary": true,
   "summaryText": "合计",
   "sumColumnList": [
@@ -131,7 +131,7 @@
       "prop": "cornName",
       "overHidden": true,
       "index": 2,
-      "width": 150
+      "width": 180
     },
     {
       "label": "毛收入",

src/views/workManagement/receipt/settleAccounts.vue

@@ -102,6 +102,15 @@
     components:{
       detailPage
     },
+    created() {
+      getUserList().then(res=>{
+        res.data.data.map((item,index)=>{
+          if(index <= 20){
+            this.options.push(item)
+          }
+        })
+      })
+    },
     mounted() {
       // option.height = window.innerHeight - 340 ;
     },

src/views/workManagement/receipt/statisticalList.vue

@@ -90,7 +90,13 @@
       }
     },
     created() {
-
+      getUserList().then(res=>{
+        res.data.data.map((item,index)=>{
+          if(index <= 20){
+            this.options.push(item)
+          }
+        })
+      })
     },
     mounted() {
       // option.height = window.innerHeight - 320 ;

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

@@ -17,7 +17,7 @@
   "viewBtn": false,
   "editBtn": false,
   "delBtn": false,
-  "menuWidth": 150,
+  "menuWidth": 140,
   "searchLabelWidth": 100,
   "showSummary": true,
   "summaryText": "合计",