tangning пре 2 година
родитељ
комит
021849784c

+ 4 - 3
src/views/invoice/EditModal.vue

@@ -16,7 +16,7 @@
           {{ model[field]  }}
         </template>
         <template #img="{ model }">
-          <TableImg v-if="model.invoiceUrl" :size="200" :adaptations="true" :simpleShow="true" :imgList="[model.invoiceUrl]" />
+          <TableImg v-if="model.invoiceImg" :size="200" :adaptations="true" :simpleShow="true" :imgList="[model.invoiceImg]" />
         </template>
       </BasicForm>
     </div>
@@ -43,12 +43,12 @@
     setup(props, { emit }) {
       const fileFlow = reactive({
         file:null,
-        type:2,//2-普通发票,3-专用发票
+        type:0,//2-普通发票,3-专用发票
       })
       const { createMessage } = useMessage();
       const schemas: FormSchema[] = [
           {
-            field: 'invoiceImg',
+            field: 'invoiceEmail',
             component: 'Input',
             label: '邮箱',
             slot: 'text',
@@ -104,6 +104,7 @@
       async function onDataReceive(data) {
         resetFields();
         // let detail = await InvoiceDetail({id:data.id})
+        console.log('data',data)
         fileFlow.type = data.invoiceType
         setFieldsValue({
           ...data,

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

@@ -246,6 +246,7 @@ export default defineComponent({
       return parentList;
     }
     const handleSubmit = async () => {
+      const params = await validate();
       try {
         createConfirm({
           iconType: 'warning',
@@ -253,7 +254,6 @@ export default defineComponent({
           content: '确定要添加备件吗?',
           onOk: async () => {
             loading.value = true;
-            const params = await validate();
             let partList = [];
             for (let s = 1; s <= n.value; s++) {
               console.log('params', params, partList);

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

@@ -259,6 +259,7 @@ export default defineComponent({
       return parentList;
     }
     const handleSubmit = async () => {
+      const params = await validate();
       try {
         createConfirm({
           iconType: 'warning',
@@ -266,7 +267,6 @@ export default defineComponent({
           content: '确定要完成维修吗?',
           onOk: async () => {
             loading.value = true;
-            const params = await validate();
             await repairOver(params);
             loading.value = false;
             createMessage.success(t('common.optSuccess'));

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

@@ -122,6 +122,7 @@
         });
       }
       const handleSubmit = async () => {
+        const params = await validate();
         createConfirm({
           iconType: 'warning',
           title: () => h('span', '温馨提示'),
@@ -129,7 +130,6 @@
           onOk: async () => {
             loading.value = true
             try {
-              const params = await validate();
               await payRegister(params);
               closeModal();
               resetFields();

+ 2 - 2
src/views/work/query.vue

@@ -297,11 +297,11 @@ export default defineComponent({
           componentProps: {
             options: [
               {
-                  label: '支付',
+                  label: '支付',
                   value: 0,
                   key: '0',
                 },{
-                label: '支付成功',
+                label: '支付',
                 value: 1,
                 key: '1',
               },

+ 85 - 85
src/views/work/recoveryModal.vue

@@ -255,91 +255,91 @@ export default defineComponent({
           },
         ],
       },
-      {
-        field: 'work-info',
-        component: 'Divider',
-        label: '工单信息',
-      },{
-        field: 'warrantyType',
-        component: 'RadioGroup',
-        required: true,
-        label: '保修类型',
-        defaultValue:1,
-        componentProps: {
-          placeholder: '请填写姓名',
-          options:[
-            { label: '保修期内', value: 0 },
-            { label: '保修期外', value: 1 },
-            { label: '非保修项目', value: 2 },
-          ],
-        },
-      },
-      {
-        field: 'warrantyExpirationDate',
-        component: 'DatePicker',
-        label: '保修届满日期',
-        required: true,
-        colProps: {
-          span: 18,
-        },   
-        componentProps: {
-          valueFormat: 'YYYY-MM-DD',
-        },  
-      },{
-          field: 'repairManId',
-          label: '维修工程师',
-          component: 'ApiSelect',
-          required: true,
-          componentProps: {
-            api: getByRoleType,
-            numberToString: true,
-            labelField: 'nickName',
-            valueField: 'id',
-            immediate: true,
-            params: {
-              roleType: 3,
-            },
-          },
-          colProps: {
-            span: 18,
-          },
-        },{
-          field: 'supplyAdminId',
-          label: '供应链管理员',
-          component: 'ApiSelect',
-          required: true,
-          componentProps: {
-            api: getByRoleType,
-            numberToString: true,
-            labelField: 'nickName',
-            valueField: 'id',
-            immediate: true,
-            params: {
-              roleType: 4,
-            },
-          },
-          colProps: {
-            span: 18,
-          },
-        },{
-          field: 'testerId',
-          label: '测试工程师',
-          component: 'ApiSelect',
-          required: true,
-          componentProps: {
-            api: getByRoleType,
-            numberToString: true,
-            labelField: 'nickName',
-            valueField: 'id',
-            immediate: true,
-            params: {
-              roleType: 5,
-            },
-          },
-          colProps: {
-            span: 18,
-          },
-        },
+      // {
+      //   field: 'work-info',
+      //   component: 'Divider',
+      //   label: '工单信息',
+      // },{
+      //   field: 'warrantyType',
+      //   component: 'RadioGroup',
+      //   required: true,
+      //   label: '保修类型',
+      //   defaultValue:1,
+      //   componentProps: {
+      //     placeholder: '请填写姓名',
+      //     options:[
+      //       { label: '保修期内', value: 0 },
+      //       { label: '保修期外', value: 1 },
+      //       { label: '非保修项目', value: 2 },
+      //     ],
+      //   },
+      // },
+      // {
+      //   field: 'warrantyExpirationDate',
+      //   component: 'DatePicker',
+      //   label: '保修届满日期',
+      //   required: true,
+      //   colProps: {
+      //     span: 18,
+      //   },   
+      //   componentProps: {
+      //     valueFormat: 'YYYY-MM-DD',
+      //   },  
+      // },{
+      //     field: 'repairManId',
+      //     label: '维修工程师',
+      //     component: 'ApiSelect',
+      //     required: true,
+      //     componentProps: {
+      //       api: getByRoleType,
+      //       numberToString: true,
+      //       labelField: 'nickName',
+      //       valueField: 'id',
+      //       immediate: true,
+      //       params: {
+      //         roleType: 3,
+      //       },
+      //     },
+      //     colProps: {
+      //       span: 18,
+      //     },
+      //   },{
+      //     field: 'supplyAdminId',
+      //     label: '供应链管理员',
+      //     component: 'ApiSelect',
+      //     required: true,
+      //     componentProps: {
+      //       api: getByRoleType,
+      //       numberToString: true,
+      //       labelField: 'nickName',
+      //       valueField: 'id',
+      //       immediate: true,
+      //       params: {
+      //         roleType: 4,
+      //       },
+      //     },
+      //     colProps: {
+      //       span: 18,
+      //     },
+      //   },{
+      //     field: 'testerId',
+      //     label: '测试工程师',
+      //     component: 'ApiSelect',
+      //     required: true,
+      //     componentProps: {
+      //       api: getByRoleType,
+      //       numberToString: true,
+      //       labelField: 'nickName',
+      //       valueField: 'id',
+      //       immediate: true,
+      //       params: {
+      //         roleType: 5,
+      //       },
+      //     },
+      //     colProps: {
+      //       span: 18,
+      //     },
+      //   },
     ];
     const [registerForm, { validate, resetFields, setFieldsValue, updateSchema }] = useForm({
       labelWidth: 100,

+ 9 - 9
src/views/work/repairsparesList.vue

@@ -186,15 +186,6 @@ export default defineComponent({
           },
         },
         {
-          field: 'repairId',
-          component: 'Input',
-          label: '工单号',
-          colProps: {
-            xl: 7,
-            xxl: 7,
-          },
-        },
-        {
           field: 'repairManId',
           label: '维修工程师',
           component: 'ApiSelect',
@@ -211,6 +202,15 @@ export default defineComponent({
           colProps: {
             span: 7,
           },
+        },
+        {
+          field: 'repairId',
+          component: 'Input',
+          label: '工单号',
+          colProps: {
+            xl: 7,
+            xxl: 7,
+          },
         }
       ],
     };