货代 业务单据 改为财务单据

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -190,9 +190,9 @@
                   <i v-if="index != 0" :disabled="detailData.status == 1" class="el-icon-arrow-up"
                     @click="moveUp(row, index)" style="color:#409EFF;"></i>
                 </el-tooltip>
-                <el-tooltip effect="dark" content="向下移动" placement="bottom"> <i v-if="index != (data.length - 1)"
-                    :disabled="detailData.status == 1" class="el-icon-arrow-down" @click="moveDown(row, index)"
-                    style="color:#409EFF;"></i></el-tooltip>
+                <el-tooltip effect="dark" content="向下移动" placement="bottom"> <i
+                    v-if="index != (data.length - 1)" :disabled="detailData.status == 1" class="el-icon-arrow-down"
+                    @click="moveDown(row, index)" style="color:#409EFF;"></i></el-tooltip>
               </div>
             </div>
           </template>
@@ -1109,6 +1109,7 @@ export default {
       this.form.corpsName = row.cname;
       this.form.belongToCorpId = row.belongtocompany
       this.form.clientMessage = (row.cname ? row.cname : '') + '\r\n' + (row.addr ? row.addr : '')
+      console.log(row)
       if (this.data.length > 0) {
         this.data.forEach(e => {
           e.productPrice = productCal(

src/views/iosBasicData/ComputationCenter/index.vue

@@ -10,7 +10,7 @@
                         <span slot="label">待收</span>
                     </el-tab-pane>
                     <el-tab-pane label="业务单据" name="业务单据">
-                        <span slot="label" style="color: #4c9e44">业务单据</span>
+                        <span slot="label" style="color: #4c9e44">财务单据</span>
                     </el-tab-pane>
                     <el-tab-pane label="已完成" name="已完成"></el-tab-pane>
                 </el-tabs>
@@ -180,14 +180,15 @@ import {bbusinesstypeList} from "@/api/iosBasicData/bbusinesstype";
                             overHidden:true,
                         },
                         {
-                            label: "单据日期",
+                            label: "结算日期",
                             prop: "billDate",
                             overHidden:true,
                             width:"150",
                         },
+
                         {
-                            label: "单据开始日期",
-                            prop: "businessDateStart",
+                            label: "结算日期起",
+                            prop: "billDateStart",
                             search:true,
                             overHidden:true,
                             hide:true,
@@ -197,8 +198,8 @@ import {bbusinesstypeList} from "@/api/iosBasicData/bbusinesstype";
                             valueFormat: "yyyy-MM-dd HH:mm:ss",
                         },
                         {
-                            label: "单据结束日期",
-                            prop: "businessDateEnd",
+                            label: "结算日期止",
+                            prop: "billDateEnd",
                             search:true,
                             overHidden:true,
                             hide:true,
@@ -207,6 +208,28 @@ import {bbusinesstypeList} from "@/api/iosBasicData/bbusinesstype";
                             format: "yyyy-MM-dd",
                             valueFormat: "yyyy-MM-dd HH:mm:ss",
                         },
+                        {
+                          label: "单据开始日期",
+                          prop: "businessDateStart",
+                          search:true,
+                          overHidden:true,
+                          hide:true,
+                          searchLabelWidth:'100',
+                          type: "date",
+                          format: "yyyy-MM-dd",
+                          valueFormat: "yyyy-MM-dd HH:mm:ss",
+                        },
+                        {
+                          label: "单据结束日期",
+                          prop: "businessDateEnd",
+                          search:true,
+                          overHidden:true,
+                          hide:true,
+                          searchLabelWidth:'100',
+                          type: "date",
+                          format: "yyyy-MM-dd",
+                          valueFormat: "yyyy-MM-dd HH:mm:ss",
+                        },
                         // {
                         //     label: "单据日期",
                         //     prop: "billDate",

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -70,7 +70,7 @@
                                     </search-query>
                                 </el-form-item>
                             </el-col>
-                            <el-col :span="9">
+                            <el-col :span="5">
                                 <el-form-item label="事由" prop="remarks">
                                     <el-input style="width: 100%;" v-model="form.remarks"
                                               size="small" autocomplete="off"
@@ -80,6 +80,18 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="4">
+                              <el-form-item label="结算日期" prop="billDate">
+                                <el-date-picker v-model="form.billDate" clearable
+                                                style="width: 100%;"
+                                                type="date" size="small"
+                                                :disabled="editSave"
+                                                format="yyyy-MM-dd"
+                                                value-format="yyyy-MM-dd"
+                                                placeholder="选择结算日期">
+                                </el-date-picker>
+                              </el-form-item>
+                            </el-col>
+                            <el-col :span="4">
                                 <el-form-item label="业务开始" prop="businessDateStart">
                                     <el-date-picker v-model="form.businessDateStart" clearable
                                                     style="width: 100%;"
@@ -469,6 +481,9 @@ export default {
                 remarks: [
                     {required: true, message: '请输入付费事由', trigger: 'blur'},
                 ],
+                billDate: [
+                  {required: true, message: '请选择结算日期', trigger: 'blur'},
+                ],
                 estimatedTime: [
                     {required: true, message: '请输入预计收回', trigger: 'blur'},
                 ],

src/views/tirePartsMall/basicData/customerInformation/detailsPage.vue

@@ -516,26 +516,24 @@ export default {
             controls: false,
             precision: 2,
           },
-
-            {
-                label:"品牌",
-                prop:"brandId",
-                props:{
+          {
+            label:"品牌",
+            prop:"brandId",
+            props:{
                   label:'cname',
                   value:'id'
                 },
-                span:24,
-                search:true,
-                dicDate:[],
-                multiple:true,
-                dicUrl: '/api/blade-sales-part/brandDesc/listAllV1?type=PP',
-                type:"tree",
-                rules: [{
-                    message: "请选择品牌",
-                    trigger: "click"
-                }]
+            span:24,
+            search:true,
+            dicDate:[],
+            multiple:true,
+            dicUrl: '/api/blade-sales-part/brandDesc/listAllV1?type=PP',
+            type:"tree",
+            rules: [{
+                      message: "请选择品牌",
+                      trigger: "click"
+                   }]
             }
-
             ,
           // {
           //   label: "使用信用额度",