Browse Source

提交箱管达沃特

caojunjie 2 years ago
parent
commit
59b2c513ac

+ 54 - 0
src/views/boxManagement/sellingContainers/index.vue

@@ -126,6 +126,60 @@ export default {
           prop: 'remarks',
           prop: 'remarks',
           width: 500,
           width: 500,
           search: true,
           search: true,
+        }, {
+          label: "制单人",
+          prop: "createUserName",
+          searchProp:"createUser",
+          overHidden: true,
+          width: 100,
+          search: true,
+          filterable: true,
+          remote: true,
+          type: "select",
+          dicUrl: "/api/blade-user/page?size=20&current=1&account={{key}}",
+          props: {
+            label: "account",
+            value: "id",
+            res: 'data.records'
+          }
+        }, {
+          label: "制单日期",
+          prop: "createTime",
+          searchProp:"createTimeList",
+          type: "date",
+          overHidden: true,
+          width: 200,
+          searchRange: true,
+          searchDefaultTime: ["00:00:00", "23:59:59"],
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd HH:mm:ss"
+        }, {
+          label: "更新人",
+          prop: "updateUserName",
+          searchProp:"updateUser",
+          overHidden: true,
+          width: 100,
+          search: true,
+          filterable: true,
+          remote: true,
+          type: "select",
+          dicUrl: "/api/blade-user/page?size=20&current=1&account={{key}}",
+          props: {
+            label: "account",
+            value: "id",
+            res: 'data.records'
+          }
+        }, {
+          label: "更新日期",
+          prop: "updateTime",
+          searchProp:"updateTimeList",
+          type: "date",
+          overHidden: true,
+          width: 200,
+          searchRange: true,
+          searchDefaultTime: ["00:00:00", "23:59:59"],
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd HH:mm:ss"
         }]
         }]
       }
       }
     }
     }

+ 9 - 8
src/views/businessManagement/deliveryNotice/detailsPageEdit.vue

@@ -200,14 +200,15 @@
               >库存刷新</el-button>
               >库存刷新</el-button>
             </template>
             </template>
             <template slot="actualQuantity" slot-scope="{ row }">
             <template slot="actualQuantity" slot-scope="{ row }">
-              <el-input
-                v-if="row.$cellEdit"
-                v-model.trim="row.actualQuantity"
-                v-input-limit="0"
-                @change="actualQuantityChange(row)"
-                :disabled="detailData.seeDisabled || arrivalDisabled || deliverDisabled"
-              ></el-input>
-              <span v-else>{{ row.actualQuantity | IntegerFormat }}</span>
+<!--              <el-input-->
+<!--                v-if="row.$cellEdit"-->
+<!--                v-model.trim="row.actualQuantity"-->
+<!--                v-input-limit="0"-->
+<!--                @change="actualQuantityChange(row)"-->
+<!--                :disabled="detailData.seeDisabled || arrivalDisabled || deliverDisabled"-->
+<!--              ></el-input>-->
+<!--              <span v-else>{{ row.actualQuantity | IntegerFormat }}</span>-->
+              <span>{{ row.actualQuantity | IntegerFormat }}</span>
             </template>
             </template>
 <!--            到货数量-->
 <!--            到货数量-->
             <template slot="arrivalQuantity" slot-scope="{ row }">
             <template slot="arrivalQuantity" slot-scope="{ row }">

+ 2 - 1
src/views/businessManagement/salesOrder/configuration/customerContact.json

@@ -44,7 +44,8 @@
     },
     },
     {
     {
       "name": "cntrVolumn",
       "name": "cntrVolumn",
-      "type": "sum"
+      "type": "sum",
+      "decimals":5
     }
     }
   ],
   ],
   "column":[{
   "column":[{

+ 1 - 1
src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -3579,7 +3579,7 @@ export default {
             }
             }
             // 体积合计
             // 体积合计
             if (item.property == "cntrVolumn") {
             if (item.property == "cntrVolumn") {
-              sums[index] = cntrVolumn ? cntrVolumn.toFixed(2) : "0.00";
+              sums[index] = cntrVolumn ? cntrVolumn.toFixed(5) : "0.00000";
             }
             }
           }
           }
         })
         })

+ 2 - 1
src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -902,8 +902,9 @@ export default {
   },
   },
   async created() {
   async created() {
     if (this.detailData.id) {
     if (this.detailData.id) {
-      this.getDetail(this.detailData.id);
+      // this.getDetail(this.detailData.id);
     }
     }
+    // form.portOfLoad
     this.tableOption = await this.getColumnData(
     this.tableOption = await this.getColumnData(
       this.getColumnName(1),
       this.getColumnName(1),
       tableOption
       tableOption

+ 2 - 1
src/views/financialManagement/paymentSettle/configuration/mainList.json

@@ -2,7 +2,7 @@
   "lazy": true,
   "lazy": true,
   "tip": false,
   "tip": false,
   "searchShow": true,
   "searchShow": true,
-  "searchMenuSpan": 16,
+  "searchMenuSpan": 24,
   "dialogWidth": "60%",
   "dialogWidth": "60%",
   "align": "center",
   "align": "center",
   "height": "auto",
   "height": "auto",
@@ -78,6 +78,7 @@
       "label": "人民币金额",
       "label": "人民币金额",
       "prop": "amount",
       "prop": "amount",
       "overHidden": true,
       "overHidden": true,
+      "search": true,
       "width": 120,
       "width": 120,
       "index": 5
       "index": 5
     },
     },

+ 2 - 1
src/views/financialManagement/receiptSettle/configuration/mainList.json

@@ -2,7 +2,7 @@
   "lazy": true,
   "lazy": true,
   "tip": false,
   "tip": false,
   "searchShow": true,
   "searchShow": true,
-  "searchMenuSpan": 16,
+  "searchMenuSpan": 24,
   "dialogWidth": "60%",
   "dialogWidth": "60%",
   "align": "center",
   "align": "center",
   "searchSpan": 8,
   "searchSpan": 8,
@@ -78,6 +78,7 @@
       "label": "人民币金额",
       "label": "人民币金额",
       "prop": "amount",
       "prop": "amount",
       "overHidden": true,
       "overHidden": true,
+      "search": true,
       "width": 120,
       "width": 120,
       "index": 5
       "index": 5
     },
     },

+ 4 - 0
src/views/statisticAnalysis/accountBalanceC/index.vue

@@ -90,6 +90,10 @@ export default {
           searchDefaultTime: ["00:00:00", "23:59:59"],
           searchDefaultTime: ["00:00:00", "23:59:59"],
           format: "yyyy-MM-dd",
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss"
           valueFormat: "yyyy-MM-dd HH:mm:ss"
+        },{
+          label: '溢付款余额',
+          prop: 'inOverpayment',
+          overHidden: true,
         }]
         }]
       }
       }
     }
     }

+ 4 - 0
src/views/statisticAnalysis/accountBalanceD/index.vue

@@ -90,6 +90,10 @@ export default {
           searchDefaultTime: ["00:00:00", "23:59:59"],
           searchDefaultTime: ["00:00:00", "23:59:59"],
           format: "yyyy-MM-dd",
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss"
           valueFormat: "yyyy-MM-dd HH:mm:ss"
+        },{
+          label: '溢付款余额',
+          prop: 'inOverpayment',
+          overHidden: true,
         }]
         }]
       }
       }
     }
     }