1

src/views/device/putModal.vue

@@ -66,9 +66,9 @@
             xxl: 18,
           },
           componentProps: {
-            api: async ()=>{
+            api: async () => {
               let list = await cameraAllType();
-              return list.filter(item => item.name != '旧双目相机');
+              return list.filter((item) => item.name != '旧双目相机');
             },
             numberToString: true,
             labelField: 'name',
@@ -82,8 +82,8 @@
                   value: '标准版',
                   key: '1',
                 },
-              ]
-              if(val == 9 || val == 10){
+              ];
+              if (val == 9 || val == 10) {
                 option.push({
                   label: 'RTK版',
                   value: 'RTK版',
@@ -150,7 +150,10 @@
           },
         },
       ];
-      const [registerForm, { validate, resetFields, getFieldsValue, setFieldsValue, updateSchema }] = useForm({
+      const [
+        registerForm,
+        { validate, resetFields, getFieldsValue, setFieldsValue, updateSchema },
+      ] = useForm({
         labelWidth: 120,
         schemas,
         showActionButtonGroup: false,
@@ -172,6 +175,32 @@
         let wifiNamePrefix = data.wifiName && data.wifiName.split('_')[0];
         updateSchema([
           { field: 'colour', componentProps: { options: getColor(data.type || 1) } },
+          {
+            field: 'version',
+            componentProps: {
+              options:
+                data.type == 9 || data.type == 10
+                  ? [
+                      {
+                        label: '标准版',
+                        value: '标准版',
+                        key: '1',
+                      },
+                      {
+                        label: 'RTK版',
+                        value: 'RTK版',
+                        key: '2',
+                      },
+                    ]
+                  : [
+                      {
+                        label: '标准版',
+                        value: '标准版',
+                        key: '1',
+                      },
+                    ],
+            },
+          },
           { field: 'wifiNamePrefix', componentProps: { options: getWifilist(data.type || 1) } },
         ]);
         setFieldsValue({
@@ -200,13 +229,13 @@
           10: ['4DSS_'],
           11: ['4DSG_'],
         };
-        let list = wifiObj[type] ||  ['4DKKPRO_', '4DKKMI_', '4DSS_', '4DSG_'];
+        let list = wifiObj[type] || ['4DKKPRO_', '4DKKMI_', '4DSS_', '4DSG_'];
         return list.map((res) => {
           return { label: res, value: res };
         });
       }
       const handleSubmit = async () => {
-        modelRef.value
+        modelRef.value;
         try {
           const params = await validate();
           let api = params.id ? updateCameraType : cameraIn;

src/views/order/data.ts

@@ -670,18 +670,18 @@ export const differenceColumns: BasicColumn[] = [
     dataIndex: 'payStatus',
     // slots: { customRender: 'orderStatus' },
     customRender: ({ record }) => {
-      return record.payStatus ? record.payStatus : '-';
+      return record.payStatus || '-';
     },
     width: 80,
   },
   {
     title: '充值方式',
-    dataIndex: 'payMethod',
+    dataIndex: 'payType',
     width: 100,
   },
   {
     title: '相机SN',
-    dataIndex: 'snCode',
+    dataIndex: 'cameraSn',
     width: 100,
   },
   {