111

src/views/work/confirmPriceModal.vue

@@ -193,6 +193,7 @@
         })
         setFieldsValue({
           ...data,
+          remark: '',
           warrantyExpirationDateText: data.warrantyDate + '(' + t(`routes.spares.warrantyType.${data.warrantyType}`) + ')',
           deviceInfo: t(`routes.scene.tableType.${data.cameraType}`) + data.cameraSnCode,
         });

src/views/work/query.vue

@@ -280,7 +280,7 @@
                 {
                   label: '待发件',
                   value: 41,
-                  key: '4',
+                  key: '41',
                 },
                 {
                   label: '待备料',
@@ -305,7 +305,7 @@
                 {
                   label: '待核账',
                   value: 82,
-                  key: '8',
+                  key: '82',
                 },
                 {
                   label: '待回收',

src/views/work/quoteModel.vue

@@ -11,7 +11,7 @@
     <div class="pt-2px pr-3px">
       <BasicForm @register="registerForm">
         <template #text="{ model, field }">
-          {{ model[field] || '明细' }}
+          {{ model[field] }}
         </template>
         <template #add>
           <div>
@@ -223,10 +223,10 @@
         list.map((ele,index) => {
           appendSchemaByField(ele, '');
           if(index == 0 && ele.defaultValue){
-            valueObj[ele.field] = ele.defaultValue
+            // valueObj[ele.field] = ele.defaultValue
           }
         });
-        setFieldsValue(valueObj)
+        // setFieldsValue(valueObj)
         n.value++;
       }
       function add() {
@@ -272,7 +272,7 @@
                 field: 'priceListText' + ele.priceListId,
                 component: 'InputNumber',
                 label: countIndex,
-                labelWidth: 40,
+                labelWidth: 35,
                 slot: 'text',
                 // labelWidth:300,
                 // subLabel:"数量",
@@ -351,15 +351,14 @@
             component: 'Input',
             slot: 'text',
             required: false,
-            defaultValue: isJm ? '减免' : '明细',
             colProps: {
-              span: 3,
+              span: 1,
             },
           },
           {
             field: 'deviceTypeId' + number,
-            label: '',
-            labelWidth: 0,
+            label: isJm ? '减免' : '明细',
+            labelWidth: 50,
             component: 'Input',
             colProps: {
               span: 8,
@@ -385,7 +384,7 @@
             labelWidth: 80,
             componentProps: {
               max: 999,
-              min: 1,
+              min: isJm ? -999 : 1,
               onChange: () => {
                 setTimeout(() => {
                   updataCount();
@@ -409,15 +408,14 @@
           },
           {
             field: 'remark' + number,
-            label: '备注',
-            labelWidth: 53,
+            label: `　备注`,
+            labelWidth: 50,
             component: 'Input',
             colProps: {
               offset: 6,
               span: 18,
               pull: 5,
             },
-            rules: [{ required: true }],
             componentProps: {
               api: allList,
               labelField: 'name',
@@ -473,6 +471,7 @@
                   priceListsparams.push({
                   count: 1,
                   name: params[`deviceTypeId${index}`],
+                  remark: params[`remark${index}`],
                   price : params[`device_${index}`],
                   type: 2,
                 });