计划管理缺陷修复

src/views/equiptManagement/equipmentLedger/index.vue

@@ -128,6 +128,7 @@ export default {
             search: true,
             sortable: true,
             overHidden: true,
+            width: 100,
             rules: [
               {
                 required: true,
@@ -157,6 +158,7 @@ export default {
             search: true,
             addDisplay:false,
             editDisplay:false,
+            width: 100,
             // rules: [
             //   {
             //     required: true,
@@ -200,6 +202,7 @@ export default {
                 value: 3,
               },
             ],
+            width: 100,
             rules: [
               {
                 required: true,
@@ -227,6 +230,35 @@ export default {
             prop: "macSpec",
             sortable: true,
             search: false,
+            width: 100,
+          },
+          {
+            label: "作业中心",
+            prop: "workCenterName",
+            sortable: true,
+            search: false,
+            width: 150,
+            display:false
+            // type: "select",
+            // dicUrl:"/api/blade-desk/BA/WorkCenter/listForSelect",
+            // props:{
+            //   label:"wcName",
+            //   value:"id"
+            // }
+          },
+          {
+            label: "作业中心",
+            prop: "workCenterId",
+            sortable: true,
+            search: false,
+            width: 150,
+            hide: true,
+            type: "select",
+            dicUrl:"/api/blade-desk/BA/WorkCenter/listForSelect",
+            props:{
+              label:"wcName",
+              value:"id"
+            }
           },
           {
             label: "设备IP",
@@ -235,6 +267,7 @@ export default {
             search: false,
             addDisplay:false,
             editDisplay:false,
+            width: 150,
             rules: [
               {
                 required: true,
@@ -250,6 +283,7 @@ export default {
             span: 24,
             search: true,
             type: "select",
+            width: 100,
             dicData: [
               {
                 label: "是",
@@ -270,6 +304,7 @@ export default {
             type: "textarea",
             maxlength: 100,
             showWordLimit: true,
+            width: 100,
             minRows: 3,
           },
           {
@@ -351,7 +386,8 @@ export default {
         typeName: row.typeName,
         used: row.used,
         virtualMac: row.virtualMac ? 1 : 0,
-        attachLink:row.attachLink.length > 0 ? row.attachLink[0] : ''
+        attachLink:row.attachLink.length > 0 ? row.attachLink[0] : '',
+        workCenterId:row.workCenterId
       }
       addDevice(params).then(res => { 
         if(res.data.code == 200){
@@ -375,7 +411,8 @@ export default {
         typeName: row.typeName,
         used: row.used,
         virtualMac: row.virtualMac ? 1 : 0,
-        attachLink:row.attachLink.length > 0 ? row.attachLink[0] : ''
+        attachLink:row.attachLink.length > 0 ? row.attachLink[0] : '',
+        workCenterId:row.workCenterId
       }
       console.log('link----------',row.attachLink && row.attachLink != '' && typeof(row.attachLink) == String ? row.attachLink : row.attachLink.length > 0 ? row.attachLink[0] : '')
       console.log('row------------',row)
@@ -438,9 +475,12 @@ export default {
           this.form = res.data.data
           this.form.attachLink = [this.form.attachLink]
           this.form.virtualMac = this.form.virtualMac == 1 ? true : false
+          this.form.workCenterId = this.form.workCenterId == '-1' ? '' : this.form.workCenterId  + ''
+          done();
         })
+      }else{
+        done();
       }
-      done();
     },
     uploadAfter(res, done, loading, column){
       console.log('res-----------------',res)

src/views/equiptManagement/measurementRecords/index.vue

@@ -9,7 +9,7 @@
             </template>
 
             <template #menu-right="{ size }">
-
+                <el-button type="primary" @click="handleImport">导入</el-button>
             </template>
             <!-- <template #menu="scope">
                 <el-button type="primary" link @click="setCrew(scope.row.bcId)">设置人员</el-button>
@@ -36,6 +36,17 @@
         <!-- 提醒配置 -->
         <reminder-configuration v-if="isConfigOpen" :showDialog="isConfigOpen" @closeDialog="setCrewOpeSancel"></reminder-configuration>
         <!-- <alertConfigDialog v-if="isConfigOpen" :showDialog="isConfigOpen" @closeDialog="setCrewOpeSancel"></alertConfigDialog> -->
+
+        <!-- 导入 -->
+        <basic-import
+            v-if="isShowImport"
+            title="导入"
+            :isShow="isShowImport"
+            templateUrl="/blade-desk/measurementRecords/importTemplate"
+            templateName="计量模板.xls"
+            importUrl="/blade-desk/measurementRecords/import"
+            @closeDialog="closeDialog"
+        ></basic-import>
     </basic-container>
 </template>
 <script>
@@ -45,6 +56,7 @@ import { getLazyList, remove, update, add, getMenu } from '@/api/system/menu';
 import { mapGetters } from 'vuex';
 import {getRecorderList,addRecorder,updateRecorder,deleteRecorder} from "@/api/equiptManagement/measurementRecords"
 
+import basicImport from '@/components/basic-import/main.vue'
 import setPersonnel from "@/components/dialogCom/setPersonnel.vue"
 import alertConfigDialog from './alertConfigDialog.vue'
 import reminderConfiguration from './reminderConfiguration.vue'
@@ -52,12 +64,14 @@ export default {
     components: {
         setPersonnel,
         alertConfigDialog,
-        reminderConfiguration
+        reminderConfiguration,
+        basicImport
     },
     data() {
         return {
             bcId: null,
             setCrewOpen: false,
+            isShowImport:false,
             form: {},
             query: {},
             loading: true,
@@ -301,6 +315,15 @@ export default {
         handleConfig(){
             this.isConfigOpen = true
         },
+        handleImport(){
+            this.isShowImport = true
+        },
+        closeDialog(val){
+            this.isShowImport = false
+            if(val){
+                this.onLoad()
+            }
+        },
         // 设置班组人员
         setCrew(bcId) {
             console.log(9999, bcId)

src/views/orderManagement/sinTerPlanOrder.vue

@@ -493,26 +493,26 @@ export default {
               },
             ],
           },
-          {
-            label: '已交付数量',
-            prop: 'deliveryQty',
-            search: false,
-            sortable: true,
-            span: 12,
-            headerAlign: 'center',
-            align: 'center',
-            width: 170,
-          },
-          {
-            label: '未交付数量',
-            prop: 'undeliveredQty',
-            search: false,
-            sortable: true,
-            span: 12,
-            headerAlign: 'center',
-            align: 'center',
-            width: 170,
-          },
+          // {
+          //   label: '已交付数量',
+          //   prop: 'deliveryQty',
+          //   search: false,
+          //   sortable: true,
+          //   span: 12,
+          //   headerAlign: 'center',
+          //   align: 'center',
+          //   width: 170,
+          // },
+          // {
+          //   label: '未交付数量',
+          //   prop: 'undeliveredQty',
+          //   search: false,
+          //   sortable: true,
+          //   span: 12,
+          //   headerAlign: 'center',
+          //   align: 'center',
+          //   width: 170,
+          // },
           // {
           //     label: '异常类型',
           //     prop: 'createName',