售后工单表格字段调整

src/main.js

@@ -53,7 +53,7 @@ import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-codes.css';
 import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css';
 function render(props = {}) {
   const { container, routerBase, fileMain } = props;
-  console.log(fileMain,'fileMain')
+  
   Vue.component('fileMain', fileMain);
 
   // const router = new VueRouter({

src/utils/dict/index.js

@@ -13,8 +13,6 @@ export const useDict = (dict) => {
 };
 //获取字典label
 export const useDictLabel = (dict) => {
-  console.log('dict--------');
-  console.log(dict);
   if (!dict || !Array.isArray(dict)) {
     console.error('请传入正确的字典');
     return '';

src/views/salesServiceManagement/accessory/components/accessoryDialog.vue

@@ -245,7 +245,6 @@
     },
     methods: {
       init(row, type) {
-        // let currentUser = JSON.parse(sessionStorage['currentUser']);
         let currentUser = getCurrentUser();
         this.form.receivingDeptId = currentUser.currentGroupId; // 部门id
         this.roleVOListData();

src/views/salesServiceManagement/accessory/components/spareInfo.vue

@@ -58,7 +58,6 @@
 
 <script>
 import AssetsDialog from '../../components/AssetsDialog.vue';
-// import { parameterGetByCode } from '@/api/main/index.js';
 export default {
   components: {
     AssetsDialog

src/views/salesServiceManagement/components/AssetsDialog.vue

@@ -538,30 +538,6 @@ export default {
         this.$message.error('请至少选择一条数据！');
         return;
       }
-      // if (this.dimension == 1) {
-      //   let boolen = this.selectionList.every((item) => item.outboundNum > 0);
-      //   if (!boolen) {
-      //     this.$message.error('请输入出库数量！');
-      //     return;
-      //   }
-      // }
-      // let data = null;
-      // if (this.dimension != 1) {
-      //   data = await storageApi.getHierarchyList({
-      //     ids: this.selectionList.map((item) => item.id).join(','),
-      //     type: this.dimension
-      //   });
-      // } else {
-      //   data = await storageApi.getHierarchyFifo({
-      //     type: this.dimension,
-      //     builders: this.selectionList.map((item) => {
-      //       return {
-      //         categoryId: item.categoryId,
-      //         num: item.outboundNum || item.measureQuantity
-      //       };
-      //     })
-      //   });
-      // }
       this.selectionList = this.selectionList.filter((item) => {
         if (item.warehouseList?.length > 0) {
           item['warehouseId'] = item.warehouseList[0].warehouse_id;

src/views/salesServiceManagement/components/invoiceDialog.vue

@@ -95,22 +95,6 @@
         :selection.sync="selection"
         height="400px"
       ></ele-pro-table>
-      <!-- <ele-pro-table
-        v-else
-        ref="tableRef3"
-        :columns="listColumn"
-        :datasource="packingList"
-        :need-page="false"
-        tool-class="ele-toolbar-form"
-        :selection.sync="selection"
-        height="400px"
-      >
-        <template v-slot:industryArtFiles="scope">
-          <el-form-item style="margin-bottom: 20px">
-            <fileMain v-model="scope.row.industryArtFiles" type="view"></fileMain>
-          </el-form-item>
-        </template>
-      </ele-pro-table>-->
     </div>
     <div slot="footer" class="footer">
       <el-button type="primary" @click="submitAdd">确认</el-button>
@@ -285,18 +269,6 @@ export default {
           align: 'center',
           showOverflowTooltip: true
         }
-        // {
-        //   prop: 'materielDesignation',
-        //   label: '物料代号',
-        //   align: 'center',
-        //   showOverflowTooltip: true
-        // },
-        // {
-        //   prop: 'engrave',
-        //   label: '刻码',
-        //   align: 'center',
-        //   showOverflowTooltip: true
-        // }
       ],
       contactId: '',
       goodsShow: false,
@@ -309,9 +281,6 @@ export default {
     open(data, obj) {
       this.contactId = data;
       this.addRepairNotesDialog = true;
-      // this.contractId = data.contractId;
-      // this.rowClickData.id = data.orderId;
-      // this.rowClickData.docNo = data.orderCode;
       // 数据回显 ***
       this.rowClickData.id = obj.orderId;
       this.rowClickData.docNo = obj.orderCode;

src/views/salesServiceManagement/components/sparePartsList.vue

@@ -302,20 +302,7 @@
           tableList: []
         },
         totalPrice: 0,
-        typeIdList: [
-          // {
-          //   label: '工时',
-          //   value: '1'
-          // },
-          // {
-          //   label: '零配件',
-          //   value: '2'
-          // },
-          // {
-          //   label: '差旅费',
-          //   value: '3'
-          // }
-        ]
+        typeIdList: []
       };
     },
     created() {
@@ -449,9 +436,6 @@
           if (this.source == '配件回收') {
             return true;
           }
-          // if (scope.row.demandId && this.state == '可操作') {
-          //   return false;
-          // }
           let flag =
             scope.row.typeId == 2 &&
             scope.row.isApply != 1 &&
@@ -474,9 +458,6 @@
           if (this.source == '配件回收') {
             return true;
           }
-          // if (row.demandId && this.state == '可操作') {
-          //   return false;
-          // }
           let flag =
             this.type != 'view' &&
             row.isApply != 1 &&
@@ -487,10 +468,6 @@
       // 方案表格操作权限
       schemeTableTool() {
         return (row) => {
-          // if (row.demandId && this.state == '可操作') {
-          //   return true;
-          // }
-
           let flag = this.type == 'view' || row.isApply == 1;
           return flag;
         };
@@ -498,9 +475,6 @@
       // input输入权限
       inputOperate() {
         return (row) => {
-          // if (row.demandId && this.state == '可操作') {
-          //   return true;
-          // }
           let flag = this.type == 'view' || row.isApply == 1;
           return flag;
         };
@@ -560,8 +534,8 @@
           singlePrice: '',
           settlementPrice: ''
         };
-        let o = this.typeIdList.find(item=>item.value == row.typeId);
-        if(o.value != 2){
+        let o = this.typeIdList.find((item) => item.value == row.typeId);
+        if (o.value != 2) {
           obj.name = o.label;
         }
         this.$set(this.form.tableList, index, obj);

src/views/salesServiceManagement/demandList/components/addDialog.vue

@@ -30,7 +30,7 @@
 </template>
 
 <script>
-  import { mapGetters, mapActions } from 'vuex';
+  import { mapGetters } from 'vuex';
   import modalTitle from '@/BIZComponents/modalTitle.vue';
   import customerDialog from '@/views/financialManage/components/customerListDialog.vue';
   import SubmitDialog from './submitDialog.vue';
@@ -42,7 +42,6 @@
     getSalesDemandById
   } from '@/api/salesServiceManagement/index';
 
-  // import fileMain from '@/components/addDoc/index.vue';
   import info from '@/views/salesServiceManagement/components/info.vue';
 
   export default {
@@ -187,37 +186,11 @@
       },
       // 保存
       async submitAdd() {
-        // let data = this.$refs.infoRef.getValue();
-        // if (!data.contactInfoVOS?.length) {
-        //   this.$message.warning('联系人信息至少有1条');
-        //   return;
-        // }
         try {
           let pData = await this.handleParameter();
           if (!pData) {
             return;
           }
-          // let valid = await this.$refs.infoRef.getValidate();
-          // let expectedTime = data.expectedTime
-          //   ? this.formatDate(data.expectedTime)
-          //   : '';
-          // let pData = {
-          //   ...this.form,
-          //   name: data.name,
-          //   faultLevel: data.faultLevel,
-          //   expectedTime: expectedTime,
-          //   contactId: data.contractInfo.id,
-          //   contactCode: data.contractInfo.code,
-          //   contactName: data.contractInfo.name,
-          //   orderCode: data.orderCode,
-          //   orderId: data.orderId,
-          //   contactAddress: data.contactAddress,
-          //   productDetail: data.tableList.map((item) => {
-          //     item['produceTime'] = item['produceTime'] || null;
-          //     return item;
-          //   }),
-          //   contactInfoVOS: data.contactInfoVOS
-          // };
           let requestname =
             this.title === '新增' ? saveSalesDemand : updateSalesDemand;
           const res = await requestname(pData);

src/views/salesServiceManagement/evaluate/components/search.vue

@@ -79,13 +79,6 @@ export default {
           planList: this.serviceList,
           placeholder: '请选择'
         },
-        // {
-        //   label: '创建人:',
-        //   value: 'createUserName',
-        //   width: 380,
-        //   type: 'input',
-        //   placeholder: ''
-        // },
         {
           label: '创建时间：',
           value: 'createTime',

src/views/salesServiceManagement/recycle/component/search.vue

@@ -35,13 +35,6 @@
             type: 'input',
             placeholder: ''
           },
-          // {
-          //   label: '物品名称:',
-          //   value: 'categoryName',
-          //   width: 380,
-          //   type: 'input',
-          //   placeholder: ''
-          // },
           {
             label: '回收人',
             value: 'recycleName',
@@ -63,13 +56,6 @@
             type: 'input',
             placeholder: ''
           },
-          // {
-          //   label: '物品分类:',
-          //   value: 'categoryLevelName',
-          //   width: 380,
-          //   type: 'input',
-          //   placeholder: ''
-          // },
           {
             label: '物品名称:',
             value: 'categoryName',

src/views/salesServiceManagement/recycle/index.vue

@@ -30,12 +30,6 @@
           >
         </template>
         <template v-slot:action="{ row }">
-          <!-- <el-link
-            v-if="!row.workId"
-            type="primary"
-            :underline="false"
-            @click="openEdit(row, 'edit')"
-          >修改</el-link>-->
           <el-link
             v-if="row.source == 0"
             type="primary"
@@ -156,7 +150,6 @@
             align: 'center',
             showOverflowTooltip: true
           },
-          // + + 时间选择
           {
             prop: 'recycleName',
             label: '回收人',

src/views/salesServiceManagement/toDoList/components/addOrUpdateDialog.vue

@@ -185,10 +185,6 @@
         </el-tab-pane>
       </el-tabs>
     </div>
-    <!-- <info ref="infoRef" type="view" :isPurchaseNeed="false"></info>
-    <header-title title="方案"></header-title>
-    <spareParts ref="sparePartsRef" :type="type"></spareParts>-->
-
     <template v-slot:footer>
       <el-button @click="handleClose">取消</el-button>
       <el-button type="primary" @click="save('')" v-if="type != 'view'"

src/views/salesServiceManagement/toDoList/index.vue

@@ -55,20 +55,6 @@
               >
             </template>
           </el-popconfirm>
-          <!-- <el-dropdown @command="(command) => handleCommand(command, row)">
-            <span class="el-dropdown-link">
-              操作菜单
-              <i class="el-icon-arrow-down el-icon--right"></i>
-            </span>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="handleRevocation" v-if="row.planStatus == 1">撤回</el-dropdown-item>
-              <el-dropdown-item
-                command="handleDispatchOrders"
-                v-if="[0, 4,5].includes(row.planStatus)"
-              >派单</el-dropdown-item>
-              <el-dropdown-item command="handleGenerate">生成报价单</el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>-->
           <el-link
             type="primary"
             :underline="false"
@@ -83,7 +69,6 @@
             v-if="[0, 4, 5].includes(row.planStatus)"
             >派单</el-link
           >
-          <!-- <jimureportBrowse   :businessId="row.id" businessCode="eomquotationprint"></jimureportBrowse> -->
         </template>
       </ele-pro-table>
     </el-card>
@@ -191,33 +176,6 @@
             align: 'center',
             showOverflowTooltip: true
           },
-          // {
-          //   prop: 'isSyncBill',
-          //   label: '是否自动派单',
-          //   align: 'center',
-          //   showOverflowTooltip: true,
-          //   formatter: (item) => {
-          //     return {
-          //       0: '否',
-          //       1: '是'
-          //     }[item.isSyncBill];
-          //   }
-          // },
-          // {
-          //   prop: 'duration',
-          //   label: '预计售后时长(小时)',
-          //   align: 'center',
-          //   showOverflowTooltip: true,
-          //   formatter: (row) => {
-          //     if (!row.duration) return '';
-          //     if (row.durationUnit == '2')
-          //       return row.duration.toFixed(1) + ' 小时';
-          //     if (row.durationUnit == '1')
-          //       return (row.duration / 60).toFixed(1) + ' 小时';
-          //     if (row.durationUnit == '3')
-          //       return (row.duration * 24).toFixed(1) + ' 小时';
-          //   }
-          // },
           {
             prop: 'planStatus',
             label: '状态',
@@ -247,21 +205,6 @@
               }[item.urgent];
             }
           },
-          // {
-          //   prop: 'createUserName',
-          //   label: '创建人',
-          //   align: 'center',
-          //   showOverflowTooltip: true
-          // },
-          // {
-          //   prop: 'createTime',
-          //   label: '创建时间',
-          //   align: 'center',
-          //   showOverflowTooltip: true,
-          //   formatter: (_row, _column, cellValue) => {
-          //     return this.$util.toDateString(cellValue);
-          //   }
-          // },
           {
             columnKey: 'action',
             label: '操作',
@@ -368,7 +311,6 @@
           return;
         }
         this.browseShow = true;
-        // this.handleCommand('handleGenerate', this.currentRow);
       },
       cancelQuo() {
         this.browseShow = false;

src/views/salesServiceManagement/workOrder/components/declarationDialog.vue

@@ -271,50 +271,10 @@
                   title="配件回收清单"
                   v-if="visibleDialog"
                 />
-                <!-- <headerTitle title="配件回收清单" style="margin-top: 10px"></headerTitle>
-                <spareParts
-                  ref="spareCycleRef"
-                  :type="type"
-                  :source="type =='report' ? '配件回收':''"
-                  :state="type=='report'?'可操作':''"
-                  v-if="visibleDialog"
-                ></spareParts>-->
               </el-col>
             </el-tab-pane>
           </el-tabs>
         </div>
-        <!-- <el-col :span="24">
-          <info ref="infoRef" type="view" :isPurchaseNeed="false"></info>
-        </el-col>
-        <el-col :span="24">
-          <header-title title="方案" style="margin-top: 10px"></header-title>
-          <spareParts ref="sparePartsRef" :type="type == 'edit' ? 'edit' : 'view'"></spareParts>
-        </el-col>-->
-        <!-- <el-col :span="8" v-if="type=='view'">
-          <el-form-item label="报工时间" prop="acceptTime">
-            <el-input v-model="addForm.acceptTime" :disabled="true"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8" v-if="type=='view'">
-          <el-form-item label="报工人" prop="executeUserName">
-            <el-input v-model="addForm.executeUserName" :disabled="true"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8" v-if="type=='view'">
-          <el-form-item label="验收人" prop="accepterUserName">
-            <el-input v-model="addForm.accepterUserName" :disabled="true"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8" v-if="type=='view'">
-          <el-form-item label="验收时间" prop="accepterTime">
-            <el-input v-model="addForm.accepterTime" :disabled="true"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8" v-if="type=='view'">
-          <el-form-item label="验收意见" prop="accepterRemark">
-            <el-input v-model="addForm.accepterRemark" :disabled="true" type="textarea"></el-input>
-          </el-form-item>
-        </el-col>-->
       </el-row>
     </el-form>
 
@@ -430,16 +390,8 @@
           dispatchTime: res.afterSalesPlanVO.dispatchTime || '',
           name: res.afterSalesPlanVO.name || ''
         };
-        // if (this.addForm.acceptTime) {
-        //   this.$set(this.addForm, 'time', [
-        //     this.addForm.acceptTime,
-        //     this.addForm.finishTime
-        //   ]);
-        // }
         // ***
         this.$nextTick(() => {
-          // this.$refs.infoRef.init(res.afterSalesDemandVO);
-          // this.$refs.sparePartsRef.setTableValue(res?.costListVOS || []);
           // *** 报工信息的
           if (this.infoShow) {
             this.detailList = res.accessoryApply?.detailList;
@@ -455,7 +407,6 @@
             this.$refs.sparePartsRef2.setTableValue(res?.costListVOS || []);
           }
           this.$refs.plan.init(res.afterSalesPlanVO);
-          // afterSalesPlanVO
         });
       },
 
@@ -524,9 +475,6 @@
         let spare = this.type == 'edit' ? 'sparePartsRef2' : 'sparePartsRef';
         let validInfo = await this.$refs[info].getValidate();
         let validSpare = await this.$refs[spare].getValidate();
-        // if (this.type == 'report') {
-        //   let validCycle = await this.$refs.spareCycleRef.getValidate();
-        // }
         let dataA = this.$refs[info].getValue();
         let obj = this.infoData(dataA);
         this.finalSubmit(spare, this.type, obj);
@@ -658,31 +606,6 @@
           }
         });
       },
-
-      // calculateTimeDifference(totalMinutes) {
-      //   if (!totalMinutes) {
-      //     this.hours = 0;
-      //     this.minutes = 0;
-      //     return;
-      //   }
-      //   const hours = Math.floor(totalMinutes / 60);
-      //   const minutes = totalMinutes % 60;
-      //   this.hours = hours;
-      //   this.minutes = minutes;
-      // },
-      // getTime() {
-      //   if (this.addForm.time?.length) {
-      //     this.$set(
-      //       this.addForm,
-      //       'inFactDuration',
-      //       parseInt(
-      //         (new Date(this.addForm.time[1]).getTime() -
-      //           new Date(this.addForm.time[0]).getTime()) /
-      //           60000
-      //       )
-      //     );
-      //   }
-      // },
       handleClose() {
         this.visibleDialog = false;
       }
@@ -725,9 +648,6 @@
   .ele-body-custom {
     width: 100%;
     margin-bottom: 24px;
-    // :deep(.divider){
-    //   display: none;
-    // }
   }
 
   .ele-body-customA {

src/views/salesServiceManagement/workOrder/components/redeployOther2.vue

@@ -78,9 +78,6 @@ export default {
           type: 'selection',
           columnKey: 'selection',
           align: 'center'
-          // selectable: (row, index) => {
-          //  return row.id !== this.row.executeUserId;
-          // }
         },
         {
           columnKey: 'index',

src/views/salesServiceManagement/workOrder/index.vue

@@ -48,40 +48,6 @@
             v-if="row.orderStatus == 1 || row.orderStatus == 6"
             >报工</el-link
           >
-
-          <!-- <el-popconfirm class="ele-action" title="确认删除这条记录吗？" @confirm="cancel(row)">
-                        <template v-slot:reference>
-                            <el-link type="danger" :underline="false" icon="el-icon-delete">
-                                删除
-                            </el-link>
-                        </template>
-          </el-popconfirm>-->
-          <!-- *** 不用下拉组件 -->
-          <!-- <el-dropdown
-            @command="(command) => handleCommand(command, row)"
-            v-if="row.orderStatus != 5"
-          >
-            <span class="el-dropdown-link">
-              操作菜单
-              <i class="el-icon-arrow-down el-icon--right"></i>
-            </span>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="handleReceive" v-if="row.orderStatus == 0">接收</el-dropdown-item>
-              <el-dropdown-item
-                command="toRedeploy"
-                v-if="row.orderStatus == 0 || row.orderStatus == 1"
-              >转派</el-dropdown-item>
-              <el-dropdown-item
-                command="addSpareItems"
-                v-if="row.orderStatus == 1 || row.orderStatus == 2"
-              >申请配件</el-dropdown-item>
-              <el-dropdown-item
-                command="checkAndAccept"
-                v-if="row.orderStatus == 3||row.orderStatus == 6"
-              >验收</el-dropdown-item>
-              <el-dropdown-item command="evaluate" v-if="row.orderStatus == 4">评价</el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>-->
           <el-link
             type="primary"
             v-if="row.orderStatus == 0"