OW 去掉手机号校验

出口去掉字段
SOC COC 调整检索条件顺序

src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation.vue

@@ -1574,7 +1574,7 @@
                   <span style="color: #1e9fff">舱位类型</span>
                 </span>
                 <el-row>
-                  <el-col :span="12">
+                  <!-- <el-col :span="12"> -->
                     <dic-select
                       v-model="assemblyForm.cabinType"
                       placeholder="舱位类型"
@@ -1584,8 +1584,8 @@
                       :disabled="detailData.seeDisabled"
                       @selectChange="dicChange('cabinType', $event)"
                     ></dic-select>
-                  </el-col>
-                  <el-col :span="11" :offset="1">
+                  <!-- </el-col> -->
+                  <!-- <el-col :span="11" :offset="1">
                     <div>
                       <dic-select
                         v-show="assemblyForm.cabinType == '固定' || !assemblyForm.cabinType"
@@ -1606,7 +1606,7 @@
                         :disabled="detailData.seeDisabled"
                       ></dic-select>
                     </div>
-                  </el-col>
+                  </el-col> -->
                 </el-row>
               </el-form-item>
             </el-col>

src/views/iosBasicData/costcenter/coc/index.vue

@@ -207,7 +207,7 @@ export default {
                         prop: "businessNo",
                         width: "120",
                         search: true,
-                        searchOrder: 0,
+                        searchOrder: 1,
                         overHidden: true,
                     },
                     {
@@ -216,7 +216,7 @@ export default {
                         width: "80",
                         overHidden: true,
                         search: true,
-                        searchOrder: 1,
+                        searchOrder: 2,
                         type: 'select',
                         filterable: true,
                         remote: true,
@@ -234,7 +234,7 @@ export default {
                         width: "80",
                         overHidden: true,
                         search: true,
-                        searchOrder: 2,
+                        searchOrder: 3,
                         type: 'select',
                         filterable: true,
                         remote: true,
@@ -247,7 +247,7 @@ export default {
                         },
                     },
                     {
-                        label: "船公司",
+                        label: "承运人",
                         prop: "shippingCompanyCname",
                         width: "80",
                         overHidden: true,
@@ -281,7 +281,7 @@ export default {
                         prop: "transportationTerms",
                         width: "80",
                         search: true,
-                        searchOrder: 9,
+                        searchOrder: 8,
                         type: 'select',
                         filterable: true,
                         remote: true,
@@ -311,7 +311,7 @@ export default {
                         width: "100",
                         overHidden: true,
                         search: true,
-                        searchOrder: 7,
+                        searchOrder: 9,
                         type: "date",
                         format: "yyyy-MM-dd",
                         valueFormat: "yyyy-MM-dd 00:00:00",
@@ -323,7 +323,7 @@ export default {
                         width: "100",
                         overHidden: true,
                         search: true,
-                        searchOrder: 8,
+                        searchOrder: 10,
                         type: "date",
                         format: "yyyy-MM-dd",
                         valueFormat: "yyyy-MM-dd 23:59:59",
@@ -334,7 +334,7 @@ export default {
                         width: "80",
                         overHidden: true,
                         search: true,
-                        searchOrder: 5,
+                        searchOrder: 6,
                         type: 'select',
                         filterable: true,
                         remote: true,
@@ -351,7 +351,7 @@ export default {
                         width: "80",
                         overHidden: true,
                         search: true,
-                        searchOrder: 6,
+                        searchOrder: 7,
                     },
                     {
                         label: "航行天数",
@@ -365,7 +365,7 @@ export default {
                         width: "80",
                         overHidden: true,
                         search: true,
-                        searchOrder: 3,
+                        searchOrder: 5,
                         type: 'select',
                         filterable: true,
                         remote: true,
@@ -414,7 +414,7 @@ export default {
                         hide: true,
                         showColumn: false,
                         search: true,
-                        searchOrder: 10,
+                        searchOrder: 11,
                         searchSpan: 12,
                         searchValue: 0,
                     }

src/views/iosBasicData/costcenter/soc/index.vue

@@ -208,7 +208,7 @@ export default {
                         prop: "businessNo",
                         width: "120",
                         search: true,
-                        searchOrder: 0,
+                        searchOrder: 1,
                         overHidden: true,
                     },
                     {
@@ -217,7 +217,7 @@ export default {
                         width: "80",
                         overHidden: true,
                         search: true,
-                        searchOrder: 1,
+                        searchOrder: 2,
                         type: 'select',
                         filterable: true,
                         remote: true,
@@ -235,7 +235,7 @@ export default {
                         width: "80",
                         overHidden: true,
                         search: true,
-                        searchOrder: 2,
+                        searchOrder: 3,
                         type: 'select',
                         filterable: true,
                         remote: true,
@@ -294,7 +294,7 @@ export default {
                         prop: "transportationTerms",
                         width: "80",
                         search: true,
-                        searchOrder: 9,
+                        searchOrder: 8,
                         type: 'select',
                         filterable: true,
                         remote: true,
@@ -331,7 +331,7 @@ export default {
                         width: "100",
                         overHidden: true,
                         search: true,
-                        searchOrder: 7,
+                        searchOrder: 9,
                         type: "date",
                         format: "yyyy-MM-dd",
                         valueFormat: "yyyy-MM-dd 00:00:00",
@@ -343,7 +343,7 @@ export default {
                         width: "100",
                         overHidden: true,
                         search: true,
-                        searchOrder: 8,
+                        searchOrder: 10,
                         type: "date",
                         format: "yyyy-MM-dd",
                         valueFormat: "yyyy-MM-dd 23:59:59",
@@ -354,7 +354,7 @@ export default {
                         width: "80",
                         overHidden: true,
                         search: true,
-                        searchOrder: 5,
+                        searchOrder: 6,
                         type: 'select',
                         filterable: true,
                         remote: true,
@@ -372,7 +372,7 @@ export default {
                         width: "80",
                         overHidden: true,
                         search: true,
-                        searchOrder: 6,
+                        searchOrder: 7,
                     },
                     {
                         label: "航行天数",
@@ -386,7 +386,7 @@ export default {
                         width: "80",
                         overHidden: true,
                         search: true,
-                        searchOrder: 3,
+                        searchOrder: 5,
                         type: 'select',
                         filterable: true,
                         remote: true,
@@ -436,7 +436,7 @@ export default {
                         hide: true,
                         showColumn: false,
                         search: true,
-                        searchOrder: 10,
+                        searchOrder: 11,
                         searchSpan: 12,
                         searchValue: 0,
                     }

src/views/iosBasicData/financialManagement/computationCenter/detailsPage.vue

@@ -261,6 +261,9 @@
             </el-col>
           </el-row>
         </el-tab-pane>
+        <el-tab-pane label="财务信息">
+          <avue-form :option="optionForm2" v-model="form" ref="form2"> </avue-form>
+        </el-tab-pane>
         <el-tab-pane label="文件中心">
           <containerTitle title="上传附件"></containerTitle>
           <c-upload
@@ -482,6 +485,49 @@ export default {
           }
         ]
       },
+      optionForm2: {
+        menuBtn: false,
+        span: 6,
+        disabled: false,
+        labelWidth: 100,
+        column: [
+          {
+            label: "所属公司 ",
+            prop: "branchName",
+            disabled: false
+          },
+          {
+            label: "结算单位",
+            prop: "corpCnName",
+            disabled: false
+          },
+          {
+            label: "信用代码",
+            prop: "corpCnName2",
+            disabled: false
+          },
+          {
+            label: "账户名称",
+            prop: "corpCnName3",
+            disabled: false
+          },
+          {
+            label: "开户银行",
+            prop: "corpCnName4",
+            disabled: false
+          },
+          {
+            label: "银行账号",
+            prop: "corpCnName5",
+            disabled: false
+          },
+          {
+            label: "税号",
+            prop: "corpCnName6",
+            disabled: false
+          }
+        ]
+      },
       option: {},
       optionBack: {
         maxHeight: "200px",

src/views/iosBasicData/financialManagement/finstlbills/detailsPage.vue

@@ -351,7 +351,7 @@ export default {
             prop: "excelFile",
             type: "upload",
             drag: true,
-            showFileList:false,
+            showFileList: false,
             loadText: "模板上传中，请稍等",
             span: 24,
             propsHttp: {
@@ -907,7 +907,7 @@ export default {
       }
       this.excelBox = false;
       // this.$message.success("导入成功！");
-      this.searchChange(this.search,done);
+      this.searchChange(this.search, done);
       loading = false;
       done();
     },

src/views/ow/owTask/detailsPage.vue

@@ -4892,16 +4892,16 @@ export default {
       this.$refs["form"].validate((valid, done) => {
         done();
         if (valid) {
-          if (this.form.polCyTel) {
-            if (!/^[1][3,4,5,7,8,9][0-9]{9}$/.test(this.form.polCyTel)) {
-              return this.$message.error("请输入正确起运港场站电话");
-            }
-          }
-          if (this.form.podCyTel) {
-            if (!/^[1][3,4,5,7,8,9][0-9]{9}$/.test(this.form.podCyTel)) {
-              return this.$message.error("请输入正确目的港场站电话");
-            }
-          }
+          //if (this.form.polCyTel) {
+          //  if (!/^[1][3,4,5,7,8,9][0-9]{9}$/.test(this.form.polCyTel)) {
+          //    return this.$message.error("请输入正确起运港场站电话");
+          //   }
+          // }
+          // if (this.form.podCyTel) {
+          //   if (!/^[1][3,4,5,7,8,9][0-9]{9}$/.test(this.form.podCyTel)) {
+          //     return this.$message.error("请输入正确目的港场站电话");
+          //   }
+          // }
 
           for (let row of this.form.tradingBoxItemsList) {
             if (!row.code || !row.boxType || !row.boxBelongsTo || !row.boxEastName || !row.boxCategory || !row.boxStatus || !row.boxCondition) {