Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/sale/addSuppliesStockOut-from.vue

@@ -629,7 +629,7 @@ import {
             SchoolId:item.SchoolId,
             ClassName:'',
             ClassId:'',
-            CourseName:item.CourseName,
+            CourseName:'',
             SuppliesId:item.Id,
             Number:item.Number
           }

src/components/sale/myOrder-form.vue

@@ -402,7 +402,7 @@
         <div class="row " style="align-items: center;margin: 20px 0;" v-if="saveObj.OrderType==2 || saveObj.ClassScrollType == 2">
           <div style="width: 3px;height: 15px;background: #3FC4FF;margin-right: 10px"></div>成本单
         </div>
-        <q-table v-if="saveObj.OrderType==2 || saveObj.ClassScrollType == 2" :pagination="financiaMsg" style="padding-bottom:80px;" :loading="floading" no-data-label="暂无相关数据" flat
+        <q-table v-if="saveObj.OrderType==2 || saveObj.OrderType===1 || saveObj.ClassScrollType == 2" :pagination="financiaMsg" style="padding-bottom:80px;" :loading="floading" no-data-label="暂无相关数据" flat
           class="sticky-tow-column-table" :hide-pagination="true" :data="dataListCB" :columns="receiptColumns"
           row-key="name">
           <template v-slot:body-cell-FrID="props">
@@ -832,7 +832,7 @@
                 this.dataListCB = []
                 this.dataListP = []
                 data.forEach(x=>{
-                  if(x.OtherType==45){
+                  if(x.OtherType==45||x.OtherType==33){
                     this.dataListCB.push(x)
                   }else{
                     this.dataListP.push(x)

src/components/sale/orderlist.vue

@@ -764,7 +764,7 @@
                     </template>
                   </div>
                   <div class="row wrap">
-                    <div class="finance row" v-for="(x, j) in item.RefundFinanceList" v-if="x.OtherType != 45||x.OtherType != 33" :key="j"
+                    <div class="finance row" v-for="(x, j) in item.RefundFinanceList" v-if="x.OtherType != 45&&x.OtherType != 33" :key="j"
                       :style="{
                         background:
                           x.ColorState == 1
@@ -827,7 +827,7 @@
                     </template>
                   </div>
                   <div class="row wrap" v-if="item.OrderType == 2 || item.ClassScrollType == 2">
-                    <div class="finance row" v-for="(x, j) in item.RefundFinanceList" v-if="x.OtherType == 45" :key="j"
+                    <div class="finance row" v-for="(x, j) in item.RefundFinanceList" v-if="x.OtherType == 45||x.OtherType == 33" :key="j"
                       :style="{
                         background:
                           x.ColorState == 1
@@ -1640,6 +1640,7 @@
         item.tab = tab;
         this.myorderObjOption = item;
         this.isShowmyorderForm = true;
+        console.log(this.myorderObjOption,'====')
       },
       //关闭订单详情
       closeMOSaveForm() {

src/utils/erpindex.js

@@ -81,9 +81,9 @@ export default {
       //域名管理对象
       Vue.prototype.domainManager = function () {
  
-        let domainUrl = 'http://192.168.10.65:8083';
+        let domainUrl = 'http://192.168.10.2:8083';
         let viewFileUrl = 'http://192.168.10.214:8120';
-        let mallUrl = "http://192.168.10.46:8200";
+        let mallUrl = "http://192.168.10.2:8088";
  
         let vtUploadUrl = "http://upload.oytour.com";
         let vtViewUrl = "http://192.168.10.214:8130";