瀏覽代碼

修改问题

tangning 2 年之前
父節點
當前提交
075c3e9af7

+ 1 - 1
src/api/spares/model.ts

@@ -196,7 +196,7 @@ export interface detailResult {
   RepairComment:any;
   priceList:any[];
   lastRepairId:any;
-}
+} 
 export type InvoiceListResul = BasicPageParams<InvoiceList>;
 /**
  * @description: Request list return value

+ 4 - 4
src/views/home/lineEcharts.vue

@@ -70,15 +70,15 @@ async function getAddUser() {
   let apiSrc = volumeTrend;
   let { kjList = [], kkList = [], ssList = [], } = await apiSrc(SearchData);
   kjList.map((ele) => {
-    xdata.unshift(ele.groupKey);
-    kj.unshift(ele.count);
+    xdata.push(ele.groupKey);
+    kj.push(ele.count);
   });
   kk = kkList.map(ele => ele.count)
   ss = ssList.map(ele => ele.count)
   yixStringData.value = xdata;
   viewStaticsData.value.kjList = kj;
-  viewStaticsData.value.kkList = kk.reverse();
-  viewStaticsData.value.ssList = ss.reverse();
+  viewStaticsData.value.kkList = kk;
+  viewStaticsData.value.ssList = ss;
   handlesetOptions();
 }
 function handlesetOptions() {

+ 1 - 1
src/views/sys/error-log/index.vue

@@ -110,7 +110,7 @@ export default defineComponent({
           },
         },
         {
-          field: 'time',
+          field: 'timeList',
           label: '操作时间',
           component: 'RangePicker',
           componentProps: {

+ 26 - 19
src/views/work/detail.vue

@@ -86,26 +86,33 @@
             <DescriptionsItem label="接单日期">
               {{ detailData.orderReceivingVo?.createTime }}
             </DescriptionsItem>
-            <DescriptionsItem label="检测结果" v-if="detailData.repairRegisterVo">
-              <div>
-                <p class="htmlText" :title="detailData.repairRegisterVo.checkResult">{{ detailData.repairRegisterVo.checkResult }}</p>
-                <PreviewGroup>
-                  <Image
-                    :width="80"
-                    :height="80"
-                    v-for="item in detailData.repairRegisterVo.checkImg"
-                    :key="item"
-                    :src="item"
-                  ></Image>
-                </PreviewGroup>
-              </div>
-            </DescriptionsItem>
-            <DescriptionsItem label="检测日期">
-              {{ detailData.repairRegisterVo?.createTime }}
-            </DescriptionsItem>
-            <DescriptionsItem label="所需备件">
-              {{ detailData.repairRegisterVo?.partNamesStr }}
+          </Descriptions>
+          <!-- <Descriptions title="" :column="3">
+            <DescriptionsItem label="备注内容">
+              {{ detailData.repairerVo?.remark }}
             </DescriptionsItem>
+          </Descriptions> -->
+          <Descriptions v-for="(Voitem, index) in detailData.repairRegisterVo" :key="Voitem.createTime" :column="3">
+                <DescriptionsItem :label="index=='0'?'检测结果':'维修登记'">
+                <div>
+                  <p class="htmlText" :title="Voitem.checkResult">{{ Voitem.checkResult }}</p>
+                  <PreviewGroup>
+                    <Image
+                      :width="80"
+                      :height="80"
+                      v-for="item in Voitem.checkImg"
+                      :key="item"
+                      :src="item"
+                    ></Image>
+                  </PreviewGroup>
+                </div>
+              </DescriptionsItem>
+              <DescriptionsItem :label="index=='0'?'检测日期':'登记日期'">
+                {{ Voitem?.createTime }}
+              </DescriptionsItem>
+              <DescriptionsItem label="所需备件">
+                {{ Voitem?.partNamesStr }}
+              </DescriptionsItem>
           </Descriptions>
           <Descriptions title="维修清单" :column="3" layout="vertical">
             <DescriptionsItem label="备件信息" :span="3">

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

@@ -43,7 +43,7 @@
             },
             {
               label: '付款登记',
-              ifShow:getCheckPerm('work_payments') && record.status == 80,
+              ifShow:getCheckPerm('work_payments') && (record.status == 80 ||record.status == 40),
               onClick: handlePayLog.bind(null, record),
             },
             {

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

@@ -241,47 +241,47 @@ export default defineComponent({
                   key: '0',
                 },{
                 label: '待检测',
-                value: 1,
+                value: 10,
                 key: '1',
               },{
                 label: '待报价',
-                value: 2,
+                value: 20,
                 key: '2',
               },{
                 label: '待确认',
-                value: 3,
+                value: 30,
                 key: '3',
               },{
                 label: '已取消',
-                value: 4,
+                value: 40,
                 key: '4',
               },{
                 label: '待备料',
-                value: 5,
+                value: 50,
                 key: '5',
               },{
                 label: '维修中',
-                value: 6,
+                value: 60,
                 key: '6',
               },{
-                label: '待回收',
-                value: 7,
+                label: '待测试',
+                value: 70,
                 key: '7',
               },{
-                label: '待测试',
-                value: 8,
+                label: '待支付',
+                value: 80,
                 key: '8',
               },{
-                label: '待支付',
-                value: 9,
+                label: '待回收',
+                value: 90,
                 key: '9',
               },{
                 label: '待发货',
-                value: 10,
+                value: 100,
                 key: '10',
               },{
                 label: '已发货',
-                value: 11,
+                value: 110,
                 key: '11',
               },
             ],