新加MP文件

public/MP_verify_fQsNnvYqtNgJdiMR.txt

@@ -0,0 +1 @@
+fQsNnvYqtNgJdiMR

src/views/approveDataH/configuration/mainList.json

@@ -3,7 +3,7 @@
   "tip": false,
   "simplePage": true,
   "searchShow": true,
-  "searchMenuSpan": 8,
+  "searchMenuSpan": 24,
   "dialogWidth": "60%",
   "align": "center",
   "height": "auto",
@@ -100,6 +100,21 @@
       "index": 9
     },
     {
+      "label": "开船日期",
+      "prop": "etd",
+      "search": true,
+      "searchProp": "etdList",
+      "type": "date",
+      "unlinkPanels": true,
+      "searchRange": true,
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd HH:mm:ss",
+      "searchDefaultTime": ["00:00:00", "23:59:59"],
+      "overHidden": true,
+      "width": 100,
+      "index": 9.1
+    },
+    {
       "label": "业务员",
       "prop": "srcCnName",
       "search": true,

src/views/serviceConfiguration/modifyData/detailsPage.vue

@@ -76,9 +76,8 @@
                             <dic-select style="width: 100%;" v-show="rowFrom.fieldValueNew == 'SALES'"
                                 v-model="rowFrom.secondLevelName" placeholder="业务员" key="id" label="realName"
                                 res="records" url="/blade-user/page" :filterable="true" :remote="true"
-                                dataName="realName" @selectChange="dicChange('srcCnName', $event)"></dic-select>
+                                dataName="realName" @selectChange="dicChange('salesName', $event)"></dic-select>
                         </div>
-
                     </template>
                 </avue-crud>
             </trade-card>
@@ -335,31 +334,44 @@ export default {
                     this.rowFrom.secondLevelName = null
                 }
             } else if (name == 'srcCnName') {
+                console.log(row)
                 if (row) {
-                    // this.$set(this.rowFrom,'secondLevel',row.id)
-                    // this.$set(this.rowFrom,'secondLevelName',row.cnName)
-                    this.rowFrom.secondLevel = row.id
-                    this.rowFrom.secondLevelName = row.cnName
+                    this.$set(this.rowFrom,'secondLevel',row.id)
+                    this.$set(this.rowFrom,'secondLevelName',row.cnName)
+                    // this.rowFrom.secondLevel = row.id
+                    // this.rowFrom.secondLevelName = row.cnName
                 } else {
                     this.rowFrom.secondLevel = null
                     this.rowFrom.secondLevelName = null
                 }
-
             }else if (name == '所属公司') {
                 if (row) {
-                    // this.$set(this.rowFrom,'secondLevel',row.id)
-                    // this.$set(this.rowFrom,'secondLevelName',row.cnName)
-                    this.rowFrom.secondLevel = row.id
-                    this.rowFrom.secondLevelName = row.deptName
+                    this.$set(this.rowFrom,'secondLevel',row.id)
+                    this.$set(this.rowFrom,'secondLevelName',row.deptName)
+                    // this.rowFrom.secondLevel = row.id
+                    // this.rowFrom.secondLevelName = row.deptName
                 } else {
                     this.rowFrom.secondLevel = null
                     this.rowFrom.secondLevelName = null
                 }
 
-            }  else {
+            } else if (name == 'salesName') {
+                if (row) {
+                    this.$set(this.rowFrom,'secondLevel',row.id)
+                    this.$set(this.rowFrom,'secondLevelName',row.realName)
+                    // this.rowFrom.secondLevel = row.id
+                    // this.rowFrom.secondLevelName = row.deptName
+                } else {
+                    this.rowFrom.secondLevel = null
+                    this.rowFrom.secondLevelName = null
+                }
+
+            } else {
                 if (row) {
-                    this.rowFrom.fieldValueNew = row.id
-                    this.rowFrom.fieldValueNewName = row.cnName
+                    this.$set(this.rowFrom,'secondLevel',row.id)
+                    this.$set(this.rowFrom,'secondLevelName',row.cnName)
+                    // this.rowFrom.fieldValueNew = row.id
+                    // this.rowFrom.fieldValueNewName = row.cnName
                 } else {
                     this.rowFrom.fieldValueNew = null
                     this.rowFrom.fieldValueNewName = null