Merge remote-tracking branch 'origin/dev' into dev

src/views/iosBasicData/OceanFreightImport/bills/assembly/reportformsFrame/PurchaseNotice.vue

@@ -108,7 +108,7 @@
             </el-col>
             <el-col :span="24">
                 <el-form-item label="船代:" prop="corpCnName">
-                    <el-input type="age" style="width: 50%;" v-model="documentForm.bookingAgentCnName" size="small"
+                    <el-input type="age" style="width: 50%;" v-model="documentForm.shippingAgencyCname" size="small"
                         autocomplete="off" clearable placeholder="船代">
                     </el-input>
                 </el-form-item>

src/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsFrame/PurchaseNotice.vue

@@ -114,7 +114,7 @@
             </el-col>
             <el-col :span="24">
                 <el-form-item label="船代:" prop="corpCnName">
-                    <el-input type="age" style="width: 50%;" v-model="documentForm.bookingAgentCnName" size="small"
+                    <el-input type="age" style="width: 50%;" v-model="documentForm.shippingAgencyCname" size="small"
                         autocomplete="off" clearable placeholder="船代">
                     </el-input>
                 </el-form-item>

src/views/iosBasicData/financeProfit/index.vue

@@ -255,6 +255,15 @@ export default {
                         searchOrder: 12
                     },
                     {
+                        label: "日期",
+                        prop: "statisticsDate",
+                        width:100,
+                        overHidden: true,
+                        type: "date",
+                        format: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd",
+                    },
+                    {
                         label: "往来单位",
                         prop: "corpName",
                         overHidden: true,

src/views/serviceConfiguration/modifyData/detailsPage.vue

@@ -368,8 +368,8 @@ export default {
 
             } else {
                 if (row) {
-                    this.$set(this.rowFrom,'secondLevel',row.id)
-                    this.$set(this.rowFrom,'secondLevelName',row.cnName)
+                    this.$set(this.rowFrom,'fieldValueNew',row.id)
+                    this.$set(this.rowFrom,'fieldValueNewName',row.cnName)
                     // this.rowFrom.fieldValueNew = row.id
                     // this.rowFrom.fieldValueNewName = row.cnName
                 } else {