tangning 2 年之前
父节点
当前提交
60bdf587b2
共有 3 个文件被更改,包括 54 次插入11 次删除
  1. 2 1
      src/views/work/addAccessoryModel.vue
  2. 5 5
      src/views/work/detail.vue
  3. 47 5
      src/views/work/quoteModel.vue

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

@@ -17,7 +17,7 @@
           <a-button type="primary" @click="add">添加备件</a-button>
         </template>
         <template #del="{ field }">
-          <Button @click="del(field)">删除</Button>
+          <Button v-if="field != 1" @click="del(field)">删除</Button>
         </template>
       </BasicForm>
     </div>
@@ -183,6 +183,7 @@
           ...data,
           deviceInfo: t(`routes.scene.tableType.${data.cameraType}`) + data.cameraSnCode,
         });
+        add()
       }
       function del(field) {
         removeSchemaByFiled([`partId${field}`, `partCount${field}`, `${field}`]);

+ 5 - 5
src/views/work/detail.vue

@@ -243,19 +243,19 @@
                   ? '前台送修'
                   : `快递寄送  ${item.customerAddress.sendTrackingNum}`
               }}</div> -->
-                <div class="itemText htmlText" v-if="item.repairRegisterVo"
+                <div class="itemText htmlText" v-if="item.repairRegisterVo"  :title="item.repairRegisterVo.checkResult"
                   >检测结论: {{ item.repairRegisterVo.checkResult }}</div
                 >
-                <div class="itemText htmlText" v-if="item.repairRegisterVo"
+                <div class="itemText htmlText" v-if="item.repairRegisterVo" :title="item.repairRegisterVo.partNamesStr"
                   >所需备件: {{ item.repairRegisterVo.partNamesStr }}</div
                 >
-                <div class="itemText htmlText" v-if="item.orderReceiving"
+                <div class="itemText htmlText" v-if="item.orderReceiving" :title="item.orderReceiving.orderFaultMsg"
                   >机器外观: {{ item.orderReceiving.orderFaultMsg }}</div
                 >
-                <div class="itemText htmlText" v-if="item.repairTest?.resultInfo"
+                <div class="itemText htmlText" v-if="item.repairTest?.resultInfo" :title="item.repairTest?.resultInfo"
                   >测试描述: {{ item.repairTest.resultInfo }}</div
                 >
-                <div class="itemText htmlText" v-if="item.remark">{{item.remark}}</div>
+                <div class="itemText htmlText" v-if="item.remark" :title="item.remark">{{item.remark}}</div>
                 <div class="iamgeList">
                   <PreviewGroup>
                     <Image

+ 47 - 5
src/views/work/quoteModel.vue

@@ -17,10 +17,11 @@
           <div>
             <a-button type="primary" @click="updataRepairInfo">重置</a-button>
             <a-button type="primary" @click="add" style="margin-left:20px">添加明细</a-button>
+            <a-button type="primary" @click="addReduction" style="margin-left:20px">添加减免</a-button>
           </div>
         </template>
         <template #del="{ field }">
-          <Icon v-if="(n - 1) == field" @click="del(field)" icon="ant-design:close-circle-outlined" :size="18" :class="`mr-2`" />
+          <Icon @click="del(field)" icon="ant-design:close-circle-outlined" :size="18" :class="`mr-2`" />
           <!-- <Button v-if="(n - 1) == field" @click="del(field)">删除</Button> -->
         </template>
         <template #delList="{ field }">
@@ -212,10 +213,22 @@
         });
       }
       function del(field) {
-        removeSchemaByFiled([`deviceTypeId${field}`, `deviceType${field}`, `device_${field}`, `${field}`]);
+        removeSchemaByFiled([`deviceTypeId${field}`, `deviceType${field}`, `device_${field}`, `${field}`, `remark${field}`]);
         n.value--;
         updataCount()
       }
+      function addReduction() {
+        let list = addSchemas(n.value,true);
+        let valueObj = {}
+        list.map((ele,index) => {
+          appendSchemaByField(ele, '');
+          if(index == 0 && ele.defaultValue){
+            valueObj[ele.field] = ele.defaultValue
+          }
+        });
+        setFieldsValue(valueObj)
+        n.value++;
+      }
       function add() {
         let list = addSchemas(n.value);
         list.map((ele) => {
@@ -324,8 +337,11 @@
         setTimeout(() => {
           setFieldsValue(valueObj);
         }, 10);
+        // if(countIndex == 0) {
+        //   add()
+        // }
       }
-      function addSchemas(number) {
+      function addSchemas(number, isJm = false) {
         let priceListsLength = fileFlow.priceLists.filter(ele => ele.type == 0).length;
         let parentList: FormSchema[] = [
           {
@@ -335,10 +351,12 @@
             component: 'Input',
             slot: 'text',
             required: false,
+            defaultValue: isJm ? '减免' : '明细',
             colProps: {
               span: 3,
             },
-          },{
+          },
+          {
             field: 'deviceTypeId' + number,
             label: '',
             labelWidth: 0,
@@ -389,6 +407,28 @@
             },
             slot: 'del',
           },
+          {
+            field: 'remark' + number,
+            label: '备注',
+            labelWidth: 53,
+            component: 'Input',
+            colProps: {
+              offset: 6,
+              span: 18,
+              pull: 5,
+            },
+            rules: [{ required: true }],
+            componentProps: {
+              api: allList,
+              labelField: 'name',
+              valueField: 'laborCostId',
+              showSearch: true,
+              placeholder: '请输入备注',
+              onChange: (value) => {
+                console.log('onchange', value, arguments);
+              },
+            },
+          }
         ];
         return parentList;
       }
@@ -498,10 +538,11 @@
             `priceList${ele.priceListId}`,
             `priceListText${ele.priceListId}`,
             `discount${ele.priceListId}`,
+            `remark${ele.priceListId}`,
           );
         });
         for (let index = 1; index < indexa; index++) {
-          clearFiled.push(`deviceTypeId${index}`,`deviceType${index}`, `device_${index}`, `${index}`);
+          clearFiled.push(`deviceTypeId${index}`,`deviceType${index}`, `device_${index}`, `${index}`, `remark${index}`);
         }
         removeSchemaByFiled(clearFiled);
         n.value = 1;
@@ -521,6 +562,7 @@
         n,
         del,
         add,
+        addReduction,
         updataRepairInfo,
       };
     },