feat(报工点补扫): 修改报工点补扫弹窗逻辑

config/index.js

@@ -14,10 +14,10 @@ module.exports = {
         proxyTable: {
             '/host': {
                 // target: 'http://10.100.172.150:9108',  // 设置你调用的接口域名和端口号 别忘了加http
-                target: 'http://10.100.172.223:8082', // 东伟服务器地址
+                // target: 'http://10.100.172.223:8082', // 东伟服务器地址
                 // target: 'http://192.168.43.153:8080', // 训浩服务器
                 // target: 'http://10.100.172.23:8082', // 本地服务器
-                // target: 'http://10.100.172.30:8082', // 本地服务器
+                target: 'http://192.168.3.37:8082', // 本地服务器
                 changeOrigin: true,
                 pathRewrite: {
                     '^/host': ''//这里理解成用‘/host’代替target里面的地址，后面组件中我们掉接口时直接用api代替 比如我要调用'http://40.00.100.100:3002/user/add'，直接写‘/api/user/add’即可

src/views/DutyStation/components/DutyStationMakeUpDialog.vue

@@ -56,7 +56,9 @@
                             v-model="formData.stationNo"
                             size="small"
                             style="width: 100%;"
-                            placeholder="请选择工位编码">
+                            placeholder="请选择工位编码"
+                            :disabled="whetherToRecordByRFID"
+                        >
                             <el-option
                                 v-for="(item, index) in stationNoList"
                                 :key="index"
@@ -112,6 +114,24 @@
                 default: () => {
                     return {}
                 }
+            },
+            stationNo: {
+                type: String,
+                default: () => {
+                    return {}
+                }
+            },
+            passTime: {
+                type: String,
+                default: () => {
+                    return {}
+                }
+            },
+            whetherToRecordByRFID: {
+                type: Boolean,
+                default: () => {
+                    return {}
+                }
             }
         },
         watch: {
@@ -119,6 +139,8 @@
                 if (this.dialogToggle) {
                     this.formData.vin = this.vin;
                     this.formData.stationName = this.stationName;
+                    this.formData.stationNo = this.stationNo;
+                    this.formData.passTime = this.passTime;
                     // 根据报工点查询工位编号
                     this.getStationNoByStationName();
                 }
@@ -249,4 +271,4 @@
 
 <style lang="scss" scoped>
 
-</style>
\ No newline at end of file
+</style>

src/views/DutyStation/list.vue

@@ -75,6 +75,9 @@
             :vin="vin"
             :stationName="stationName"
             :id="id"
+            :stationNo="stationNo"
+            :passTime="passTime"
+            :whetherToRecordByRFID="whetherToRecordByRFID"
             @doDutyStationMakeUpConfirmClick="doDutyStationMakeUpConfirmClick">
         </DutyStationMakeUpDialog>
 
@@ -128,6 +131,12 @@
                 vin: '',
                 // 报工点
                 stationName: '',
+                // 工位编码
+                stationNo: '',
+                // 过站时间
+                passTime: '',
+                // 是否是RFID记录
+                whetherToRecordByRFID: false,
                 // 记录id
                 id: null
             }
@@ -224,11 +233,17 @@
             },
             // 点击编辑按钮
             doEditClick (dutyStation) {
-                console.log(dutyStation);
                 this.$refs.DutyStationMakeUpDialog.dialogToggle = true;
                 this.vin = dutyStation.vin;
                 this.stationName = dutyStation.stationName;
+                this.stationNo = dutyStation.stationNo;
+                this.passTime = dutyStation.passTime;
                 this.id = dutyStation.id;
+                if (dutyStation.createBy === 'RFID') {
+                    this.whetherToRecordByRFID = true;
+                } else {
+                    this.whetherToRecordByRFID = false;
+                }
             },
             // 点击报工点补扫弹窗确认按钮
             doDutyStationMakeUpConfirmClick () {
@@ -346,4 +361,4 @@
             }
         }
     }
-</style>
\ No newline at end of file
+</style>