tangning 4 months ago
parent
commit
e96fab6fe2

+ 3 - 1
src/views/account/overview/AddDownModal.vue

@@ -147,7 +147,9 @@
           { field: 'customerName', ifShow: value != '3' },
           { field: 'customerType', ifShow: value != '3' },
           { field: 'endCustomer', ifShow: value != '3' },
-          { field: 'customerPayTime', required: value == '4' },
+          { field: 'amount', ifShow: value != '3' },
+          { field: 'currencySymbol', ifShow: value != '3' },
+          { field: 'customerPayTime', required: value == '4', ifShow: value != '3' },
         ]);
       };
       async function handleConfirm() {

+ 3 - 1
src/views/account/overview/AddModal.vue

@@ -362,7 +362,9 @@
           { field: 'customerName', ifShow: value != '3' },
           { field: 'customerType', ifShow: value != '3' },
           { field: 'endCustomer', ifShow: value != '3' },
-          { field: 'customerPayTime', required: value == '4' },
+          { field: 'amount', ifShow: value != '3' },
+          { field: 'currencySymbol', ifShow: value != '3' },
+          { field: 'customerPayTime', required: value == '4', ifShow: value != '3' },
           ]);
       };
       const handleSubmit = async () => {

+ 3 - 1
src/views/empower/modal/api/AddApiModal.vue

@@ -153,7 +153,9 @@
           { field: 'customerName', ifShow: value != '3' },
           { field: 'customerType', ifShow: value != '3' },
           { field: 'endCustomer', ifShow: value != '3' },
-          { field: 'customerPayTime', required: value == '4' },
+          { field: 'amount', ifShow: value != '3' },
+          { field: 'currencySymbol', ifShow: value != '3' },
+          { field: 'customerPayTime', required: value == '4', ifShow: value != '3' },
         ]);
       };
       async function handleConfirm() {

+ 3 - 1
src/views/empower/modal/camera/AddCameraModal.vue

@@ -181,7 +181,9 @@
           { field: 'customerName', ifShow: value != '3' },
           { field: 'customerType', ifShow: value != '3' },
           { field: 'endCustomer', ifShow: value != '3' },
-          { field: 'customerPayTime', required: value == '4' },
+          { field: 'amount', ifShow: value != '3' },
+          { field: 'currencySymbol', ifShow: value != '3' },
+          { field: 'customerPayTime', required: value == '4', ifShow: value != '3' },
         ]);
       };
       async function handleConfirm() {

+ 3 - 1
src/views/empower/modal/difference/AddModal.vue

@@ -151,7 +151,9 @@
           { field: 'customerName', ifShow: value != '3' },
           { field: 'customerType', ifShow: value != '3' },
           { field: 'endCustomer', ifShow: value != '3' },
-          { field: 'customerPayTime', required: value == '4' },
+          { field: 'amount', ifShow: value != '3' },
+          { field: 'currencySymbol', ifShow: value != '3' },
+          { field: 'customerPayTime', required: value == '4', ifShow: value != '3' },
         ]);
       };
       async function onDataReceive(data) {

+ 1 - 4
src/views/productOperation/data.ts

@@ -430,7 +430,7 @@ export const getColumns = (val) => {
     },
     {
       title: 'slam帧数',
-      ifShow: isobj || val == 2 || val == 6,
+      ifShow: isobj || val == 6,
       dataIndex: 'slamCount',
       width: 80,
     },
@@ -599,9 +599,6 @@ export const getVrColumns = () => {
       dataIndex: 'panoStatus',
       width: 120,
       customRender: ({ record }) => {
-        if (!record.panoStatus) {
-          return '-';
-        }
         // 切图状态:-1切图失败 0等待中 1 排队 2切图中 3切图完成
         const obj = {
           '-1': '切图失败',

+ 1 - 1
src/views/productOperation/viewKankan.vue

@@ -90,7 +90,7 @@
               },
               {
                 label: '重算',
-                disabled: record.calcStatus == 0 || (record.status == 1 && record.payStatus != 1),
+                disabled: record.calcStatus == 0 || record.panoStatus != 3 || (record.status == 1 && record.payStatus != 1),
                 ifShow: getTypeCheckPerm('scenes-recalculate') && tableType != 3,
                 popConfirm: {
                   title: '是否重算?',