Merge branch 'dev' of http://120.79.166.78:19005/zhongzheng-edu/saas_masterPlatform into dev

.env.development

@@ -5,7 +5,7 @@ VUE_APP_TITLE =中正平台
 ENV = 'development'
 
 # 中正云教育管理后台/开发环境
-VUE_APP_BASE_API = 'http://192.168.1.24:7077/'
+VUE_APP_BASE_API = 'http://192.168.1.222:7077/'
 VUE_APP_IMG_API = 'https://file-dev.xyyxt.net'
 
 # 路由懒加载

src/components/Comon/pictureList.vue

@@ -4,7 +4,9 @@
       <img :src="backFullSrc(item.img)" alt="" />
       <div class="right">
         <h4>{{ item.label }}：</h4>
-        <p>{{ item.value || info[item.prop] }}{{ item.ch || "元" }}</p>
+        <p>
+          {{ formatPrice(item.value || info[item.prop]) }}{{ item.ch || "元" }}
+        </p>
       </div>
     </div>
   </div>
@@ -43,6 +45,12 @@ export default {
     backFullSrc(name) {
       return require(`@/assets/images/${name}@2x.png`);
     },
+    formatPrice(price) {
+      return price.toLocaleString(
+        "zh-CN",
+        (undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })
+      );
+    },
   },
 };
 </script>

src/views/financed/arap/index.vue

@@ -34,7 +34,7 @@
       @load="load"
     >
       <template slot="customize">
-        <el-button @click="openDialog({}, 4)" type="success">
+        <el-button v-if="type == 0" @click="openDialog({}, 4)" type="success">
           坏账设置
         </el-button>
         <el-button @click="batchExport" type="primary"> 导出excel </el-button>
@@ -62,7 +62,7 @@
         </div>
       </template>
       <template slot="divideCheckStatus" slot-scope="props">
-        <div>
+        <div v-if="props.scope.row.billType != 7">
           {{
             divideCheckStatus(
               props.scope.row.orderSn,
@@ -80,7 +80,7 @@
       </template>
       <template slot="btn" slot-scope="props">
         <el-button
-          v-if="props.scope.row.oId"
+          v-if="props.scope.row.oId || type == 0"
           type="text"
           @click="openDialog(props.scope.row, 3)"
         >
@@ -878,7 +878,7 @@ export default {
       if (this.type == 0 || this.type == 2) {
         data.push({
           prop: "keyNo",
-          placeholder: "业务员号",
+          placeholder: "业务号",
         });
       }
       return data;

src/views/financed/components/audit/dislogSet.vue

@@ -19,7 +19,7 @@
         </p>
         <div class="bgc_pink">
           <p>
-            待付账款：<span class="color_red">￥{{ form.payPrice }}</span>
+            待付账款：<span class="color_red">￥{{ form.divideCompanyMoney }}</span>
           </p>
         </div>
         <el-form

src/views/financed/cost/index.vue

@@ -84,6 +84,11 @@ export default {
         custom: false,
       },
       formList: [
+        {
+          prop: "tenantId",
+          placeholder: "关联机构",
+          scope: "systemtenantlist",
+        },
         {
           prop: "tpName",
           placeholder: "请输入模板名称",