ysy 1 рік тому
батько
коміт
ab9f6d2b4d

+ 1 - 1
src/styles/transition/common.scss

@@ -105,6 +105,6 @@
 }
 
 .el-input--medium .el-input__inner {
-  height: 32px  !important;
+  // height: 32px  !important;
   line-height: 32px  !important;
 }

+ 45 - 0
src/views/productionPlan/components/factoryAdd/index.vue

@@ -0,0 +1,45 @@
+<template>
+  <ele-modal
+    width="80vw"
+    :visible.sync="visible"
+    :close-on-click-modal="false"
+    custom-class="ele-dialog-form"
+    :title="title"
+  >
+    <div class="form-wrapper">
+      <headerTitle title="销售订单"> </headerTitle>
+    </div>
+  </ele-modal>
+</template>
+
+<script>
+  export default {
+    components: {},
+    data() {
+      return {
+        visible: false,
+        title: '',
+        type: 1
+      };
+    },
+
+    computed: {},
+    methods: {
+      open(type) {
+        this.type = type;
+        this.title = type == 1 ? '新增临时计划' : '编辑临时计划';
+
+        this.visible = true;
+      }
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+  .form-wrapper {
+    margin-bottom: 10px;
+  }
+  .mt20 {
+    margin-top: 20px;
+  }
+</style>

+ 10 - 2
src/views/productionPlan/index.vue

@@ -23,7 +23,7 @@
         <el-button type="danger" size="mini">延期申请</el-button>
         <el-button type="danger" size="mini">变更申请</el-button>
 
-        <el-button type="success" size="mini" v-if="timeDimensionPlanType == 3"
+        <el-button type="success" size="mini" v-if="timeDimensionPlanType == 3" @click="factAdd(1)"
           >新增</el-button
         >
       </div>
@@ -200,6 +200,8 @@
     <unpackDetails ref="DetailsRef"></unpackDetails>
 
     <disassemblePlanPop ref="disassemblePlanRef" @close="reload"></disassemblePlanPop>
+
+    <factoryAdd ref="factoryRef"></factoryAdd>
   </div>
 </template>
 
@@ -210,6 +212,7 @@
   import mergeDialog from './components/mergeDialog.vue';
   import unpackDetails from './components/unpackDetails.vue';
   import disassemblePlanPop from './components/disassemblePlanPop.vue';
+  import factoryAdd from './components/factoryAdd/index.vue'
   import { release } from '@/api/productionPlan/order.js';
   import { getCode } from '@/api/codeManagement';
   import { fieldModel } from '@/api/saleOrder';
@@ -220,7 +223,8 @@
       unpackDialog,
       mergeDialog,
       unpackDetails,
-      disassemblePlanPop
+      disassemblePlanPop,
+      factoryAdd
     },
     props: {
       timeDimensionPlanType: { type: Number, default: 1 }
@@ -780,6 +784,10 @@
         this.$refs.DetailsRef.open(type, row);
       },
 
+      factAdd(type) {
+        this.$refs.factoryRef.open(type);
+      },
+
       onSortChange(e) {
         let sort = {
           orderBy: e.order,

+ 2 - 1
vue.config.js

@@ -32,7 +32,8 @@ module.exports = {
       // 当我们的本地的请求 有/api的时候,就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
         // target: 'http://192.168.1.210:86/',
-        target: 'http://192.168.1.176:18086',
+        // target: 'http://192.168.1.176:18086',
+        target: 'http://192.168.1.125:18086',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''