Переглянути джерело

生产节拍新增计价类型

695593266@qq.com 5 місяців тому
батько
коміт
ed7d03927f

+ 13 - 4
src/views/material/BOMmanage/components/workingProcedure.vue

@@ -374,6 +374,17 @@
               </el-col>
               </el-col>
             </el-row>
             </el-row>
 
 
+            <el-row>
+              <el-col :span="24" label-width="100px">
+                <el-form-item label="计价类型" prop="pricingType">
+                  <el-radio-group v-model="beatParam.pricingType">
+                    <el-radio :label="1" :disabled="isView">计时</el-radio>
+                    <el-radio :label="2" :disabled="isView">计件</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+            </el-row>
+
             <el-row>
             <el-row>
               <el-col :span="16" label-width="100px">
               <el-col :span="16" label-width="100px">
                 <el-form-item label="工时单价" prop="taskPrice">
                 <el-form-item label="工时单价" prop="taskPrice">
@@ -1437,8 +1448,6 @@
 
 
           this.tableData.taskParam[this.currentIndex].materialQuota = res.data;
           this.tableData.taskParam[this.currentIndex].materialQuota = res.data;
 
 
-
-
           console.log(this.tableData, 'this.tableData');
           console.log(this.tableData, 'this.tableData');
         });
         });
         // this.$refs.bomDetailList.open(this.resourceBomId, this.level)
         // this.$refs.bomDetailList.open(this.resourceBomId, this.level)
@@ -1929,8 +1938,8 @@
 
 
         this.baseCount2 = rowData.baseCount2;
         this.baseCount2 = rowData.baseCount2;
         this.baseCountUnit2 = rowData.baseCountUnit2;
         this.baseCountUnit2 = rowData.baseCountUnit2;
-   this.ncCodeList =
-            this.tableData.taskParam[this.currentIndex].ncCodeList || [];
+        this.ncCodeList =
+          this.tableData.taskParam[this.currentIndex].ncCodeList || [];
         this.visible = true;
         this.visible = true;
         setTimeout(() => {
         setTimeout(() => {
           console.log(this.$refs);
           console.log(this.$refs);

+ 2 - 2
vue.config.js

@@ -37,7 +37,7 @@ module.exports = {
         // target: 'http://192.168.1.176:18086',
         // target: 'http://192.168.1.176:18086',
         // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.251:18186',
-        // target: 'http://192.168.1.125:18086',
+        target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:18186', // 测试环境
         // target: 'http://192.168.1.251:18186', // 测试环境
@@ -46,7 +46,7 @@ module.exports = {
         // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.11:18086', // 开发
         // target: 'http://192.168.1.11:18086', // 开发
         // target: 'http://192.168.1.116:18086', // 赵沙金
         // target: 'http://192.168.1.116:18086', // 赵沙金
-        target: 'http://aiot.zoomwin.com.cn:51001/api',
+        // target: 'http://aiot.zoomwin.com.cn:51001/api',
         // target: 'http://f222326r53.imwork.net',
         // target: 'http://f222326r53.imwork.net',
 
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域