66

src/views/productionPlan/components/factoryAdd/index.vue

@@ -2,44 +2,403 @@
   <ele-modal
     width="80vw"
     :visible.sync="visible"
+    v-if="visible"
     :close-on-click-modal="false"
     custom-class="ele-dialog-form"
     :title="title"
   >
     <div class="form-wrapper">
-      <headerTitle title="销售订单"> </headerTitle>
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="90px"
+        class="formbox"
+      >
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="名称:" prop="productName">
+              <el-input
+                @click.native="handleAdd"
+                placeholder="请选择物料"
+                v-model="form.productName"
+                size="mini"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="编码:" prop="productCode">
+              <el-input
+                placeholder=""
+                size="mini"
+                disabled
+                v-model="form.productCode"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="牌号:" prop="brandNum">
+              <el-input
+                placeholder=""
+                size="mini"
+                disabled
+                v-model="form.brandNum"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="型号:" prop="modelType">
+              <el-input
+                placeholder=""
+                size="mini"
+                disabled
+                v-model="form.modelType"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="规格:" prop="specification">
+              <el-input
+                placeholder=""
+                size="mini"
+                disabled
+                v-model="form.specification"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <headerTitle title="计划信息"> </headerTitle>
+
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="加工方式:" prop="produceType">
+              <el-select
+                v-model="form.produceType"
+                style="width: 100%"
+                @change="changeProduceType"
+                size="mini"
+              >
+                <el-option
+                  v-for="item of producedList"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="BOM版本:" prop="bomCategoryId">
+              <el-select
+                v-model="form.bomCategoryId"
+                style="width: 100%"
+                @change="changeBomId"
+                size="mini"
+              >
+                <el-option
+                  v-for="item of bomVersionList"
+                  :key="item.id"
+                  :label="item.name + '(V' + item.versions + '.0)'"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="工艺路线:" prop="produceRoutingId">
+              <el-select
+                v-model="form.produceRoutingId"
+                style="width: 100%"
+                @change="changeRoute"
+                size="mini"
+              >
+                <el-option
+                  v-for="item of routingList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="生产数量:" prop="requiredFormingNum">
+              <el-input
+                v-model.number="form.requiredFormingNum"
+                size="mini"
+                oninput="value=value.replace(/[^\d]/g,'')"
+                style="width: 100%"
+                placeholder="输入数量"
+              >
+                <template slot="append">{{ form.measuringUnit }} </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="批次号:" prop="batchNo">
+              <el-input
+                v-model="form.batchNo"
+                size="mini"
+                style="width: 100%"
+                placeholder="输入批次号"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item
+              label="计划开始日期:"
+              label-width="110px"
+              prop="reqMoldTime"
+            >
+              <el-date-picker
+                style="width: 100%"
+                size="mini"
+                v-model="form.reqMoldTime"
+                :pickerOptions="{
+                  disabledDate: (time) =>
+                    time.getTime() <
+                    new Date(new Date().setHours(0, 0, 0, 0)).getTime()
+                }"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item
+              label="要求完成日期:"
+              label-width="110px"
+              prop="reqMoldTime"
+            >
+              <el-date-picker
+                style="width: 100%"
+                size="mini"
+                v-model="form.reqMoldTime"
+                :pickerOptions="{
+                  disabledDate: (time) =>
+                    time.getTime() <
+                    new Date(new Date().setHours(0, 0, 0, 0)).getTime()
+                }"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <!-- 选择产品 -->
+      <EquipmentDialog
+        ref="equipmentRefs"
+        @choose="confirmChoose"
+        :selectList="[]"
+      >
+      </EquipmentDialog>
     </div>
+
+    <template v-slot:footer>
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="save" :loading="loading">
+        确定
+      </el-button>
+    </template>
   </ele-modal>
 </template>
 
 <script>
+  import EquipmentDialog from '@/views/saleOrder/components/EquipmentDialog';
+
+  import {
+    bomRoutingList,
+    bomListByPlan,
+    saveSaleToPlan
+  } from '@/api/saleOrder';
+
   export default {
-    components: {},
+    components: {
+      EquipmentDialog
+    },
     data() {
       return {
         visible: false,
         title: '',
-        type: 1
+        type: 1,
+
+        loading: false,
+        form: {
+          timeDimensionPlanType: 3,
+          categoryId: '',
+          productName: '',
+          planType: 1,
+
+          produceType: 2,
+          bomCategoryId: '',
+          produceRoutingId: '',
+          requiredFormingNum: ''
+        },
+
+        bomVersionList: [],
+        routingList: [],
+        rules: {
+          productName: [
+            { required: true, message: '请选择名称', trigger: 'change' }
+          ],
+          bomCategoryId: [
+            { required: true, message: '请选择BOM版本', trigger: 'blur' }
+          ],
+
+          produceRoutingId: [
+            { required: true, message: '请选择工艺路线', trigger: 'blur' }
+          ],
+
+          requiredFormingNum: [
+            { required: true, message: '请输入生产数量', trigger: 'blur' }
+          ]
+        },
+
+        producedList: [
+          { code: 2, name: '加工' },
+          { code: 3, name: '装配' }
+        ]
       };
     },
 
-    computed: {},
+    computed: {
+      clientEnvironmentId() {
+        return this.$store.state.user.info.clientEnvironmentId;
+      }
+    },
     methods: {
       open(type) {
         this.type = type;
         this.title = type == 1 ? '新增临时计划' : '编辑临时计划';
 
         this.visible = true;
+      },
+      handleAdd() {
+        this.$refs.equipmentRefs.open();
+      },
+
+      confirmChoose(list) {
+        console.log(list);
+        this.$set(this.form, 'categoryId', list[0].id);
+        this.$set(this.form, 'productName', list[0].name);
+        this.$set(this.form, 'productCode', list[0].code);
+        this.$set(this.form, 'specification', list[0].specification);
+        this.$set(this.form, 'brandNum', list[0].brandNum);
+        this.$set(this.form, 'modelType', list[0].modelType);
+        this.$set(this.form, 'measuringUnit', list[0].measuringUnit);
+
+        this.bomListVersion();
+      },
+
+      handleDeleteItem(index) {
+        this.form.salesOrders.splice(index, 1);
+      },
+
+      save() {
+        this.$refs.form.validate((valid) => {
+          if (!valid) {
+            return false;
+          }
+          this.loading = true;
+          saveSaleToPlan(this.form)
+            .then((res) => {
+              this.$message.success('新增成功！');
+              this.visible = false;
+              this.$emit('close', true);
+            })
+            .finally(() => {
+              this.loading = false;
+            });
+        });
+      },
+
+      bomListVersion() {
+        let param = {
+          bomType: this.form.produceType,
+          categoryId: this.form.categoryId
+        };
+        bomListByPlan(param).then((res) => {
+          this.bomVersionList = res || [];
+        });
+      },
+
+      getPlanRouting() {
+        bomRoutingList(this.form.bomCategoryId).then((res) => {
+          this.routingList = res || [];
+        });
+      },
+
+      changeProduceType() {
+        this.form.bomCategoryId = '';
+        this.form['bomCategoryName'] = '';
+        this.form['bomCategoryVersions'] = '';
+
+        this.bomVersionList = [];
+
+        this.routingList = [];
+        this.form.produceRoutingId = '';
+        this.form.produceRoutingName = '';
+        this.form.produceVersionName = '';
+        this.bomListVersion();
+      },
+
+      changeBomId() {
+        this.routingList = [];
+        this.form.produceRoutingId = '';
+        this.form.produceRoutingName = '';
+        this.form.produceVersionName = '';
+
+        this.bomVersionList.forEach((f) => {
+          if (f.id == this.form.bomCategoryId) {
+            this.$set(this.form, 'bomCategoryName', f.name);
+            this.$set(this.form, 'bomCategoryVersions', f.versions);
+          }
+        });
+
+        this.getPlanRouting();
+      },
+
+      changeRoute() {
+        this.routingList.forEach((f) => {
+          if (f.id == this.form.produceRoutingId) {
+            this.$set(this.form, 'produceRoutingName', f.name);
+            this.$set(this.form, 'produceVersionName', f.version);
+          }
+        });
+      },
+
+      cancel() {
+        this.visible = false;
       }
     }
   };
 </script>
 
 <style lang="scss" scoped>
-  .form-wrapper {
-    margin-bottom: 10px;
-  }
-  .mt20 {
-    margin-top: 20px;
+  .el-form-item {
+    margin-bottom: 14px !important;
   }
 </style>

src/views/productionPlan/components/productionPlan-search.vue

@@ -129,7 +129,7 @@
                 }
               "
             >
-              <el-option label="要求生产日期" value="reqMoldTime"></el-option>
+              <el-option label="要求完成日期" value="reqMoldTime"></el-option>
               <el-option
                 label="预测生产日期"
                 value="planFormingTime"

src/views/saleOrder/components/create-order.vue

@@ -473,11 +473,6 @@ export default {
     },
     // 确定选择
     confirmChoose(list) {
-      console.log('444', list);
-      console.log(
-        'this.form.productInfoList',
-        deepClone(this.form.productInfoList)
-      );
       list = list
         .filter(
           (i) =>

src/views/saleOrder/components/plan-submit.vue

@@ -58,7 +58,7 @@
           {{ info.newSumOrderWeight }} {{  info.newWeightUnit }}
         </el-descriptions-item>
         <el-descriptions-item>
-          <template slot="label"> 要求生产日期 </template>
+          <template slot="label"> 要求完成日期 </template>
           {{ info.reqMoldTime }}
         </el-descriptions-item>
 

src/views/saleOrder/index.vue

@@ -186,14 +186,14 @@
 
           {
             prop: 'productName',
-            label: '产品名称',
+            label: '名称',
             align: 'center',
             minWidth: 120
           },
 
           {
             prop: 'produceRoutingName',
-            label: '工艺路线',
+            label: '路线',
             align: 'center',
             minWidth: 120
           },

src/views/saleOrder/salesToProduction.vue

@@ -392,7 +392,7 @@
           >
           </el-table-column>
           <el-table-column
-            label="要求生产日期"
+            label="要求完成日期"
             align="center"
             prop="reqMoldTime"
             width="180"
@@ -403,7 +403,7 @@
                 :prop="'salesOrders.' + scope.$index + '.reqMoldTime'"
                 :rules="{
                   required: true,
-                  message: '请选择要求生产日期',
+                  message: '请选择要求完成日期',
                   trigger: 'blur'
                 }"
                 class="table-item"
@@ -659,7 +659,6 @@ export default {
       bomRoutingList(this.form.bomCategoryId).then((res) => {
         this.routingList = res || []
       })
-
     },
 
     bomListVersion() {

vue.config.js

@@ -33,7 +33,7 @@ module.exports = {
       '/api': {
         // target: 'http://192.168.1.210:86/',
         // target: 'http://192.168.1.116:18086',
-        target: 'http://192.168.1.251:18086',
+        target: 'http://192.168.1.125:18086',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''