瀏覽代碼

fix:修复为抛出变量异常

snow 1 年之前
父節點
當前提交
98102f16c7

+ 0 - 1
src/apis/service/serviceParam/Invoicing/index.js

@@ -14,5 +14,4 @@ export default {
   update: (data, params) => http(api + "titleedit", data, "post", params),
   // 更新状态
   status: (data, params) => http(api + "titlestatus", data, "post", params),
-
 };

+ 1 - 1
src/apis/service/serviceParam/organize/index.js

@@ -28,6 +28,6 @@ export default {
     // 企业删除
     qdelete: (data, params) => http(api + "customardelete", data, "post", params),
     // 企业状态
-    qstatus: (data, params) => http(api + "customarstatus", data, "post", params),
+    qstatus: (data, params) => http(api + "status", data, "post", params),
 
 };

+ 2 - 0
src/components/approval-node/src/uploadInvoice/_template.js

@@ -8,6 +8,8 @@ export const mapFields = {
     afterTax:'afterTax' //税后金额
 }
 
+export const getTableProperty = (key) => mapTemplateToTable[key]
+
 /***
  * @props
  * 发票申请编号 invoiceNo

+ 1 - 2
src/components/approval-node/src/uploadInvoice/xlsxUploadModal.vue

@@ -36,7 +36,6 @@ import dayjs from 'dayjs'
 import {
   helper,
   columns,
-  PROPERTYS,
   getTableProperty,
   createErrorMessage,
   createFieldVerification,
@@ -173,7 +172,7 @@ export default {
 
       const list = this.tableData.map(tableItem => requsetFields.reduce((prev, currentKey) => ({
         ...prev,
-        [currentKey]: currentKey === PROPERTYS.SEND_TIME ? dayjs(tableItem[currentKey] * 1000).format('YYYY-MM-DD HH:mm:ss') : tableItem[currentKey]
+        [currentKey]: tableItem[currentKey]
       }), {}))
 
       this.loading = true

+ 2 - 0
src/components/manage/src/settlementBudgetLetter/_template.js

@@ -20,6 +20,8 @@ const mapTemplateToTable = {
     '创建时间': mapFields.createTime
 }
 
+export const getTableProperty = (key) => mapTemplateToTable[key]
+
 export const columns = [
     {
         type: 'index',

+ 2 - 0
src/views/customerService/demandOrder/_template.js

@@ -10,6 +10,8 @@ const mapFields = {
   remark:'remark' //备注
 }
 
+export const getTableProperty = (key) => mapTemplateToTable[key]
+
 const mapTemplateToTable = {
   '一级分类': mapFields.primaryClassification,
   '二级分类': mapFields.secondaryClassification,

+ 54 - 1
src/views/customerService/paymentApply/columns.js

@@ -7,6 +7,58 @@ const statusList = [
   { id: '4', label: '取消议价', type: 'info' }
   // 已选完商品,取消议价
 ]
+
+const editColumns = [
+  {
+    prop: 'todo',
+    label: '平台订单编号',
+    span: 8
+  },
+
+  {
+    prop: 'todo',
+    label: '业务订单编号',
+    span: 8
+  },
+  {
+    prop: 'todo',
+    label: '创建时间',
+    span: 8
+  },
+  {
+    prop: 'todo',
+    label: '总金额',
+    span: 8
+  },
+
+  {
+    prop: 'todo',
+    label: '未回款金额',
+    span: 8
+  },
+  {
+    prop: 'todo',
+    label: '已回款金额',
+    span: 8
+  },
+  {
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    span: 8
+  },
+  {
+    prop: 'todo',
+    label: '已开票金额',
+    span: 8
+  },
+  {
+    prop: 'todo',
+    label: '未开票金额',
+    span: 8
+  }
+]
+
 const listCol = [
   {
     prop: 'todo',
@@ -64,5 +116,6 @@ const listCol = [
 
 export {
   listCol, 
-  statusList
+  statusList,
+  editColumns
 }

+ 2 - 0
src/views/customerService/workbench/components/planBudgetLetter/_template.js

@@ -20,6 +20,8 @@ const mapTemplateToTable = {
     '创建时间': mapFields.createTime
 }
 
+export const getTableProperty = (key) => mapTemplateToTable[key]
+
 export const columns = [
     {
         type: 'index',

+ 0 - 1
src/views/platformService/invoice/components/invoice-modal.vue

@@ -39,7 +39,6 @@ import {
   requsetFields,
   requiredFields,
   numberFields,
-  getTableLabel,
   intNumberFields
 } from './template'
 

+ 1 - 1
src/views/serviceParam/organize/addEdit.vue

@@ -27,7 +27,7 @@
           >
             <el-row>
               <el-col :span="24">
-                <el-form-item label="组织/企业:" prop="region">
+                <el-form-item label="组织/企业:" prop="region" v-if="organName">
                   <el-select
                     v-model="ruleForm.region"
                     style="width: 100%"

+ 2 - 0
src/views/serviceParam/organize/index.vue

@@ -358,6 +358,8 @@ export default {
      * @param {String} tyep 0-组织 1-企业
      */
     async changeStatus(id, status, type) {
+      console.log(type)
+      
       await this.$confirm(`确定要改为${status + '' === "1" ? "禁用" : "启用"}?`, {
         confirmButtonText: "确定",
         cancelButtonText: "取消",