tangning 2 tháng trước cách đây
mục cha
commit
b37e1e105d

+ 3 - 1
src/views/Accounting/ListModal.vue

@@ -181,7 +181,9 @@
         setFieldsValue({
         setFieldsValue({
           ...data,
           ...data,
           remark: '',
           remark: '',
-          deviceInfo: t(`routes.scene.tableType.${data.cameraType}`) + data.cameraSnCode,
+          deviceInfo: `${t('routes.scene.tableType.' + data.cameraType)} ${
+            data.cameraSnCode || '无'
+          }`,
         });
         });
       }
       }
       const handleSubmit = async () => {
       const handleSubmit = async () => {

+ 3 - 1
src/views/U8Sending/ListModal.vue

@@ -125,7 +125,9 @@
         setFieldsValue({
         setFieldsValue({
           ...data,
           ...data,
           remark: '',
           remark: '',
-          deviceInfo: t(`routes.scene.tableType.${data.cameraType}`) + data.cameraSnCode,
+          deviceInfo: `${t('routes.scene.tableType.' + data.cameraType)} ${
+            data.cameraSnCode || '无'
+          }`,
         });
         });
       }
       }
       const handleSubmit = async () => {
       const handleSubmit = async () => {

+ 3 - 1
src/views/spares/remarksModal.vue

@@ -98,7 +98,9 @@
         fileFlow.type = data.type;
         fileFlow.type = data.type;
         setFieldsValue({
         setFieldsValue({
           ...data,
           ...data,
-          deviceType: t(`routes.scene.tableType.${data.cameraType}`) + ' ' + data.cameraSnCode,
+          deviceType: `${t('routes.scene.tableType.' + data.cameraType)} ${
+            data.cameraSnCode || '无'
+          }`,
         });
         });
       }
       }
       const handleSubmit = async () => {
       const handleSubmit = async () => {

+ 3 - 1
src/views/work/addAccessoryModel.vue

@@ -181,7 +181,9 @@
         fileFlow.cameraType = data.cameraType;
         fileFlow.cameraType = data.cameraType;
         setFieldsValue({
         setFieldsValue({
           ...data,
           ...data,
-          deviceInfo: t(`routes.scene.tableType.${data.cameraType}`) + data.cameraSnCode,
+          deviceInfo: `${t('routes.scene.tableType.' + data.cameraType)} ${
+            data.cameraSnCode || '无'
+          }`,
         });
         });
         add();
         add();
       }
       }

+ 7 - 4
src/views/work/checkModel.vue

@@ -287,9 +287,12 @@
         setFieldsValue({
         setFieldsValue({
           ...data,
           ...data,
           ...backfill,
           ...backfill,
-          warrantyExpirationDateText:
-            data.warrantyDate + '(' + t(`routes.spares.warrantyType.${data.warrantyType}`) + ')',
-          deviceInfo: t(`routes.scene.tableType.${data.cameraType}`) + data.cameraSnCode,
+          warrantyExpirationDateText: `${data.warrantyDate || '无'}( ${t(
+            'routes.spares.warrantyType.' + data.warrantyType,
+          )})`,
+          deviceInfo: `${t('routes.scene.tableType.' + data.cameraType)} ${
+            data.cameraSnCode || '无'
+          }`,
         });
         });
       }
       }
       function del(field) {
       function del(field) {
@@ -388,7 +391,7 @@
           console.log('params', params, partList);
           console.log('params', params, partList);
           await checkRegister({
           await checkRegister({
             ...params,
             ...params,
-            faultIds: params.faultIds.map((ele) => ele[ele.length - 1]),
+            faultIds: params.faultIds && params.faultIds.map((ele) => ele[ele.length - 1]),
             partList,
             partList,
           });
           });
           clearInfo(false);
           clearInfo(false);

+ 6 - 3
src/views/work/confirmPriceModal.vue

@@ -194,9 +194,12 @@
         setFieldsValue({
         setFieldsValue({
           ...data,
           ...data,
           remark: '',
           remark: '',
-          warrantyExpirationDateText:
-            data.warrantyDate + '(' + t(`routes.spares.warrantyType.${data.warrantyType}`) + ')',
-          deviceInfo: t(`routes.scene.tableType.${data.cameraType}`) + data.cameraSnCode,
+          warrantyExpirationDateText: `${data.warrantyDate || '无'}( ${t(
+            'routes.spares.warrantyType.' + data.warrantyType,
+          )})`,
+          deviceInfo: `${t('routes.scene.tableType.' + data.cameraType)} ${
+            data.cameraSnCode || '无'
+          }`,
         });
         });
       }
       }
       function del(field) {
       function del(field) {

+ 3 - 1
src/views/work/deliveryModal.vue

@@ -110,7 +110,9 @@
         setFieldsValue({
         setFieldsValue({
           ...data,
           ...data,
           getType: 1,
           getType: 1,
-          deviceInfo: t(`routes.scene.tableType.${data.cameraType}`) + data.cameraSnCode,
+          deviceInfo: `${t('routes.scene.tableType.' + data.cameraType)} ${
+            data.cameraSnCode || '无'
+          }`,
         });
         });
       }
       }
       const handleSubmit = async () => {
       const handleSubmit = async () => {

+ 3 - 1
src/views/work/invoiceModal.vue

@@ -307,7 +307,9 @@
           ...getData,
           ...getData,
           invoiceHead: data.companyName,
           invoiceHead: data.companyName,
           invoiceStatus: data.invoiceStatus || 1,
           invoiceStatus: data.invoiceStatus || 1,
-          deviceType: t(`routes.scene.tableType.${data.cameraType}`) + ' ' + data.cameraSnCode,
+          deviceType: `${t('routes.scene.tableType.' + data.cameraType)} ${
+            data.cameraSnCode || '无'
+          }`,
         });
         });
       }
       }
       const handleUpShow = async (val, showType = false) => {
       const handleUpShow = async (val, showType = false) => {

+ 3 - 1
src/views/work/outModal.vue

@@ -197,7 +197,9 @@
         setFieldsValue({
         setFieldsValue({
           ...data,
           ...data,
           remark: '',
           remark: '',
-          deviceInfo: t(`routes.scene.tableType.${data.cameraType}`) + data.cameraSnCode,
+          deviceInfo: `${t('routes.scene.tableType.' + data.cameraType)} ${
+            data.cameraSnCode || '无'
+          }`,
         });
         });
       }
       }
       function del(field) {
       function del(field) {

+ 3 - 1
src/views/work/payLogModal.vue

@@ -135,7 +135,9 @@
         resetFields();
         resetFields();
         setFieldsValue({
         setFieldsValue({
           ...data,
           ...data,
-          deviceInfo: t(`routes.scene.tableType.${data.cameraType}`) + data.cameraSnCode,
+          deviceInfo: `${t('routes.scene.tableType.' + data.cameraType)} ${
+            data.cameraSnCode || '无'
+          }`,
         });
         });
       }
       }
       const handleSubmit = async () => {
       const handleSubmit = async () => {

+ 6 - 3
src/views/work/quoteModel.vue

@@ -226,9 +226,12 @@
         fileFlow.type = data.type;
         fileFlow.type = data.type;
         setFieldsValue({
         setFieldsValue({
           ...data,
           ...data,
-          warrantyExpirationDateText:
-            data.warrantyDate + '(' + t(`routes.spares.warrantyType.${data.warrantyType}`) + ')',
-          deviceInfo: t(`routes.scene.tableType.${data.cameraType}`) + data.cameraSnCode,
+          warrantyExpirationDateText: `${data.warrantyDate || '无'}( ${t(
+            'routes.spares.warrantyType.' + data.warrantyType,
+          )})`,
+          deviceInfo: `${t('routes.scene.tableType.' + data.cameraType)} ${
+            data.cameraSnCode || '无'
+          }`,
         });
         });
         updateSchema({
         updateSchema({
           field: 'convertWarranty',
           field: 'convertWarranty',

+ 3 - 1
src/views/work/signForModel.vue

@@ -102,7 +102,9 @@
         fileFlow.repairId = data.repairId;
         fileFlow.repairId = data.repairId;
         setFieldsValue({
         setFieldsValue({
           ...data,
           ...data,
-          deviceInfo: t(`routes.scene.tableType.${data.cameraType}`) + data.cameraSnCode,
+          deviceInfo: `${t('routes.scene.tableType.' + data.cameraType)} ${
+            data.cameraSnCode || '无'
+          }`,
         });
         });
       }
       }
       const handleSubmit = async () => {
       const handleSubmit = async () => {

+ 6 - 3
src/views/work/takingOrdersModel.vue

@@ -233,9 +233,12 @@
         resetFields();
         resetFields();
         setFieldsValue({
         setFieldsValue({
           ...data,
           ...data,
-          warrantyExpirationDateText:
-            data.warrantyDate + '(' + t(`routes.spares.warrantyType.${data.warrantyType}`) + ')',
-          deviceType: t(`routes.scene.tableType.${data.cameraType}`) + ' ' + data.cameraSnCode,
+          warrantyExpirationDateText: `${data.warrantyDate || '无'}( ${t(
+            'routes.spares.warrantyType.' + data.warrantyType,
+          )})`,
+          deviceType: `${t('routes.scene.tableType.' + data.cameraType)} ${
+            data.cameraSnCode || '无'
+          }`,
         });
         });
         updateSchema([
         updateSchema([
           {
           {