提交基础资料、箱管

src/views/basicData/container/archives.vue

@@ -29,6 +29,19 @@
                    @click="outExport">导出
         </el-button>
       </template>
+      <template slot-scope="{type,size,row,$index}" slot="menu">
+        <el-button icon="el-icon-edit" :size="size" :disabled="row.status === '使用'" :type="type"
+                   @click="$refs.crud.rowEdit(row,index)">编辑
+        </el-button>
+        <el-button
+            type="text"
+            icon="el-icon-delete"
+            size="small"
+            :disabled="row.status === '使用'"
+            @click.stop="$refs.crud.rowDel(row,$index)"
+        >删除
+        </el-button>
+      </template>
       <template slot-scope="{type,size,row,index,disabled}" slot="code">
         <span class="el-button--text" style="cursor: pointer" @click="track(row)">{{row.code}}</span>
       </template>
@@ -232,6 +245,8 @@ export default {
       optionList: {
         index: true,
         dialogDrag: true,
+        delBtn: false,
+        editBtn: false,
         span: 8,
         border: true,
         height:"auto",

src/views/basicData/customerInformation/detailsPageEdit.vue

@@ -120,6 +120,7 @@
                   <el-option v-for="(item, index) in monthOption" :key="index" :label="item.dictValue"
                     :value="item.dictKey"></el-option>
                 </el-select>
+                <el-input-number v-else-if="item.prop === 'openingAmount'" v-model="form[item.prop]" size="small" :controls="false"></el-input-number>
                 <el-input v-else type="age" v-model="form[item.prop]" size="small" autocomplete="off"></el-input>
               </el-form-item>
             </el-col>
@@ -651,8 +652,13 @@ export default {
             prop: "g"
           },
           {
+            label: "期初金额",
+            span: 8,
+            prop: "openingAmount"
+          },
+          {
             label: "账期备注",
-            span: 24,
+            span: 16,
             prop: "h"
           }
         ]
@@ -1452,4 +1458,12 @@ export default {
 ::v-deep .el-form-item__content {
   line-height: 32px;
 }
+::v-deep .el-input-number{
+  width: 100%;
+  .el-input{
+    input{
+      text-align: left;
+    }
+  }
+}
 </style>

src/views/basicData/customerManagement/supplierMaterial/detailsPageEdit.vue

@@ -81,6 +81,7 @@
                   <el-option v-for="(item, index) in paymentOption" :key="index" :label="item.dictValue"
                     :value="item.dictValue"></el-option>
                 </el-select>
+                <el-input-number v-else-if="item.prop === 'openingAmount'" v-model="form[item.prop]" size="small" :controls="false"></el-input-number>
                 <el-input v-else type="age" v-model="form[item.prop]" size="small" autocomplete="off"></el-input>
               </el-form-item>
             </el-col>
@@ -372,6 +373,10 @@ export default {
           {
             label: "纳税人识别号",
             prop: "taxpayerDifferenceCode"
+          },
+          {
+            label: "期初金额",
+            prop: "openingAmount"
           }
         ]
       },
@@ -849,4 +854,12 @@ export default {
 ::v-deep .el-form-item {
   margin-bottom: 0;
 }
+::v-deep .el-input-number{
+  width: 100%;
+  .el-input{
+    input{
+      text-align: left;
+    }
+  }
+}
 </style>

src/views/boxManagement/importReturnTrip/index.vue

@@ -13,8 +13,8 @@
           @search-change="searchChange"
           @row-del="rowDel"
           @refresh-change="refreshChange"
-          @resetColumn="resetColumnTwo('crud','option','optionList',237)"
-          @saveColumn="saveColumnTwo('crud','option','optionList',237)"
+          @resetColumn="resetColumnTwo('crud','option','optionList',237.9)"
+          @saveColumn="saveColumnTwo('crud','option','optionList',237.9)"
           :page.sync="page">
         <template slot="purchaseCompanyIdSearch">
           <crop-select v-model="search.purchaseCompanyId" corpType="GS"/>

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

@@ -183,6 +183,32 @@
       "index": 16
     },
     {
+      "label": "起始日期",
+      "prop": "rentStartDate",
+      "type": "date",
+      "search": true,
+      "unlinkPanels": true,
+      "searchRange": true,
+      "overHidden": true,
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "width": 200,
+      "index": 16.1
+    },
+    {
+      "label": "截止日期",
+      "prop": "rentEndDate",
+      "type": "date",
+      "search": true,
+      "unlinkPanels": true,
+      "searchRange": true,
+      "overHidden": true,
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "width": 200,
+      "index": 16.2
+    },
+    {
       "label": "业务类型",
       "prop": "srcBoxBillType",
       "overHidden": true,

vue.config.js

@@ -32,7 +32,7 @@ module.exports = {
       '/api': {
         //本地服务接口地址
         // target: 'http://192.168.3.64:1080',
-        // target: 'http://192.168.0.104:1080',
+        // target: 'http://192.168.0.103:1080',
         // target: 'http://124.222.119.174:1080',
         // 打包地址
         target: 'http://121.37.83.47:10004',//服务器ip