Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/components/finance/config/option.json

@@ -48,20 +48,6 @@
       ]
     },
     {
-      "label": "费用名称",
-      "prop": "costType",
-      "overHidden": true,
-      "index": 4,
-      "width": 180,
-      "rules": [
-        {
-          "required": true,
-          "message": " ",
-          "trigger": "blur"
-        }
-      ]
-    },
-    {
       "label": "合同日期",
       "prop": "accDate",
       "type": "date",
@@ -159,14 +145,6 @@
       "width": 120
     },
     {
-      "label": "商品名称",
-      "prop": "goodName",
-      "overHidden": true,
-      "index": 12,
-      "value": 0,
-      "width": 120
-    },
-    {
       "label": "备注",
       "prop": "remarks",
       "overHidden": true,

src/components/finance/financialAccount.vue

@@ -61,17 +61,17 @@
 
           <span v-else>{{corpsName}}</span>
         </template>
-        <template slot-scope="{row,index}" slot="costType">
-          <breakdown-select
-            v-if="row.$cellEdit"
-            v-model="row.costType"
-            style="width: 90%"
-            :configuration="configuration"
-            @selectValue="(value) => {getFeeValue(row, value)}"
-          >
-          </breakdown-select>
-          <span v-else>{{ row.costName }}</span>
-        </template>
+<!--        <template slot-scope="{row,index}" slot="costType">-->
+<!--          <breakdown-select-->
+<!--            v-if="row.$cellEdit"-->
+<!--            v-model="row.costType"-->
+<!--            style="width: 90%"-->
+<!--            :configuration="configuration"-->
+<!--            @selectValue="(value) => {getFeeValue(row, value)}"-->
+<!--          >-->
+<!--          </breakdown-select>-->
+<!--          <span v-else>{{ row.costName }}</span>-->
+<!--        </template>-->
         <template slot-scope="{row,index}" slot="billNo">
           <el-select placeholder="请选择"
                      v-if="row.$cellEdit"
@@ -656,8 +656,7 @@
           corpType: 'KG'
         });
         this.dialogLoading = true;
-        customerList(queryParams)
-          .then(res => {
+        customerList(queryParams).then(res => {
             this.corpData = res.data.data.records;
             this.corpPage.total = res.data.data.total;
             if (this.corpPage.total) {
@@ -669,6 +668,7 @@
           });
       },
       importCorp() {
+        // item.srcFeesId = item.id
         this.corpData.forEach((item, index) => {
           if (index == this.rowData.index) {
             item.corpId = this.selectionList[0].id;

src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -1512,11 +1512,10 @@ export default {
       }
       let amount = 0;
       let quantity = 0;
+      console.log(this.contactsData)
       this.contactsData.map(e => {
-        if (e.submitPay != 1) {
-          amount += Number(e.amount)
-          quantity += Number(e.orderQuantity)
-        }
+        amount += Number(e.amount)
+        quantity += Number(e.orderQuantity)
       })
       const price = quantity === 0? 0: Number(amount) / Number(quantity)
       this.billData = {

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -1567,7 +1567,7 @@ export default {
             type: 'date',
             rules: [
               {
-                required: true,
+                required: false,
                 message: ' ',
                 trigger: 'blur'
               }
@@ -1578,7 +1578,7 @@ export default {
             type: 'date',
             rules: [
               {
-                required: true,
+                required: false,
                 message: ' ',
                 trigger: 'blur'
               }

src/views/reimbursement/detail.vue

@@ -52,6 +52,7 @@
           type="primary"
           @click="editCustomer"
           size="small"
+          :disabled="form.status !== 0"
           :loading="btnLoading"
         >保存数据</el-button>
       </div>

src/views/reimbursement/index.vue

@@ -42,7 +42,7 @@
             icon="el-icon-delete"
             size="small"
             @click.stop="rowDel(scope.row, scope.index)"
-            :disabled="scope.row.status == 3"
+            :disabled="scope.row.status !== 0"
           >删除
           </el-button>
         </template>

src/views/wel/home/landTransportation/components/quick-launch.vue

@@ -102,11 +102,6 @@ export default {
   },
   mounted() {
     if (this.roleName.indexOf('平台') !== -1){
-      if (this.roleName.indexOf('总经理') !== -1 || this.roleName.indexOf('部门经理') !== -1 || this.roleName.indexOf('业务员') !== -1){
-        // 委托、台账
-        this.entrust = true //委托
-        this.sBook = true //台账
-      }
       if (this.roleName.indexOf('总调度') !== -1 || this.roleName.indexOf('分管调度') !== -1){
         // 调度、台账、到期提醒
         this.dispatch = true //调度
@@ -123,12 +118,18 @@ export default {
       this.track = true
     }
     if (this.roleName.indexOf('客户') !== -1){
-      this.entrust = true
-      this.dispatch = false
-      this.sBook = false
-      this.reminder = false
-      this.sendACar = false
-      this.track = false
+      if (this.roleName.indexOf('总经理') !== -1 || this.roleName.indexOf('部门经理') !== -1 || this.roleName.indexOf('业务员') !== -1){
+        // 委托、台账
+        this.entrust = true //委托
+        this.sBook = true //台账
+      }else {
+        this.entrust = true
+        this.dispatch = false
+        this.sBook = false
+        this.reminder = false
+        this.sendACar = false
+        this.track = false
+      }
     }
     if (this.roleName.indexOf('车队') !== -1){
       this.entrust = false