Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop

hb_client/src/components/customForm/index.vue

@@ -158,6 +158,16 @@
           <el-radio v-model="is_testok" :label="testokTrue">检查合格</el-radio>
           <el-radio v-model="is_testok" :label="testokFalse">检查不合格</el-radio>
         </el-form-item>
+        <el-col :span="12">
+          <el-form-item label="编号">
+            <el-input v-model="number" placeholder="编号"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="备注">
+            <el-input v-model="remark" placeholder="备注"/>
+          </el-form-item>
+        </el-col>
         <div class="dialog-footer" style="text-align: right" v-show="!isDisabled">
           <el-button @click="recordCancel">取 消</el-button>
           <el-button type="primary" @click="submitfield('1')">保存</el-button>
@@ -200,7 +210,15 @@
       isDisabled: {
         type: Boolean,
         default: false
-      }
+      },
+      number: {
+        type: String,
+        default: ''
+      },
+      remark:{
+        type: String,
+        default: ''
+      },
     },
     mounted() {
       let that = this;
@@ -719,6 +737,8 @@
         that.testrecord.record_data = that.field;//检查项列表
         that.testrecord.is_testok = that.is_testok;//检查表检查结果
         that.testrecord.id = that.recordId;//记录id
+        that.testrecord.number = that.number;//编号
+        that.testrecord.remark = that.remark;//备注
         if (that.index === '2') {//提交
           this.$emit('recordSubmit', that.testrecord);
         } else {//保存

hb_client/src/views/inm/fifo.vue

@@ -465,6 +465,7 @@
         material: "", // 物料
         count: "", //数量
         batch: "", //批次
+        expiration_date: "", //
         details:[],
       },
     ],
@@ -638,6 +639,7 @@
             material: "", // 物料
             count: "", //数量
             batch: "", //批次
+            expiration_date: "", //
             details:[],
           },
         ];
@@ -710,7 +712,21 @@
 
       async confirm(form) {
         console.log(this.inventory);
-
+        let details = [];
+        this.inventory.details.forEach(item=>{
+          let obj = new Object();
+          if(item.details.length>0){
+            obj = item;
+          }else{
+            obj.warehouse = item.warehouse;
+            obj.material = item.material;
+            obj.count = item.count;
+            obj.batch = item.batch;
+            obj.expiration_date = item.expiration_date;
+          }
+          details.push(obj);
+        });
+        this.inventory.details = details;
         createInother(this.inventory).then((res) => {
           if (res.code >= 200) {
             this.getList();

hb_client/src/views/mtm/materialDetail.vue

@@ -218,7 +218,12 @@
           </el-table>
         </el-tab-pane>
         <el-tab-pane label="装箱单" name="5" v-if="this.type == 1">
-          <el-button type="primary" icon="el-icon-plus" @click="handleCreate">
+          <el-button
+            v-if="checkPermission(['packitem_create'])"
+            type="primary"
+            icon="el-icon-plus"
+            @click="handleCreate"
+          >
             新增装箱单
           </el-button>
           <el-table
@@ -246,12 +251,14 @@
             >
               <template slot-scope="scope">
                 <el-link
+                  v-if="checkPermission(['packitem_update'])"
                   type="primary"
                   @click="handleEdit(scope)"
                 >
                   编辑
                 </el-link>
                 <el-link
+                  v-if="checkPermission(['packitem_delete'])"
                   type="danger"
                   @click="handleDelete(scope)"
                 >
@@ -405,6 +412,7 @@
       this.getwproductList();
     },
     methods: {
+      checkPermission,
       //新增装箱单
       getMaterialist() {
         getMaterialList({pageoff: true, type: 3}).then((response) => {

hb_client/src/views/pm/plan.vue

@@ -237,6 +237,9 @@
               >
               </el-date-picker>
             </el-form-item>
+            <el-form-item label="任务编号" prop="number">
+              <el-input v-model="orderplan.number" placeholder="任务编号"/>
+            </el-form-item>
           </el-form>
           <div style="text-align: right">
             <el-button
@@ -275,7 +278,13 @@
 
   import {genTree} from "@/utils";
   import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-  const defaulteorderplan = {};
+  const defaulteorderplan = {
+    order:'',
+    number:'',
+    count:'',
+    end_date:'',
+    start_date:'',
+  };
   export default {
     components: {Pagination, gantt},
     data() {
@@ -314,7 +323,7 @@
         dialogType: "new",
         activeName: "订单排产",
         rule1: {
-          number: [{required: true, message: "请输入", trigger: "blur"}],
+          number: [{required: true, message: "请输入任务编号", trigger: "blur"}],
         },
         proList: [],
       };

hb_client/src/views/sam/order.vue

@@ -128,7 +128,7 @@
         :rules="rule1"
       >
         <el-form-item label="订单编号" prop="number">
-          <el-input v-model="order.number" placeholder="订单编号自动生成" disabled="true"/>
+          <el-input v-model="order.number" placeholder="订单编号"/>
         </el-form-item>
         <el-form-item label="所需产品" prop="product">
           <el-select style="width: 100%" v-model="order.product" placeholder="请选择">
@@ -224,8 +224,9 @@
         dialogVisible: false,
         dialogType: "new",
         rule1: {
-          product: [{required: true, message: "请输入", trigger: "blur"}],
-          delivery_date: [{required: true, message: "请输入", trigger: "blur"}],
+          number: [{required: true, message: "请输入订单编号", trigger: "blur"}],
+          product: [{required: true, message: "请选择所需产品", trigger: "blur"}],
+          delivery_date: [{required: true, message: "请选择交货日期", trigger: "blur"}],
         },
       };
     },

hb_client/src/views/wpm/need.vue

@@ -520,6 +520,8 @@
         :hasPicture="hasPicture"
         :formID="recordform"
         :wproduct="wproduct"
+        :remark="remark"
+        :number="number"
         :recordId="recordId"
         :isDisabled="isDisabled"
         :isMidTesting="is_midtesting"
@@ -935,7 +937,9 @@
         filtersList: [{text: '切割', value: '切割'}, {text: '磨边', value: '磨边'},
           {text: '清洗', value: '清洗'}, {text: '热弯成型', value: '热弯成型'}, {text: '化学钢化', value: '化学钢化'},
           {text: '镀膜', value: '镀膜'}, {text: '断膜', value: '断膜'}, {text: '汇流条制备', value: '汇流条制备'},
-          {text: '夹层', value: '夹层'}, {text: '包边', value: '包边'}]
+          {text: '夹层', value: '夹层'}, {text: '包边', value: '包边'}],
+        remark:'',
+        number:'',
       };
     },
     computed: {},
@@ -1281,6 +1285,8 @@
         that.recordVisible = false;
         that.recordId = scope.row.id;
         that.recordform = scope.row.form;
+        that.number = scope.row.number;
+        that.remark = scope.row.remark;
         that.formName = scope.row.form_.name;
         if (that.innerIndex !== '2') {//非复检
           getrffieldList({form: this.recordform, enabled: true, page: 1, page_size: 100}).then((response) => {
@@ -1364,6 +1370,8 @@
             that.recordFinishedVisible = true;
             that.formName = res.data.form_.name;
             that.fieldList = res.data.record_data;
+            that.number = res.data.number;
+            that.remark = res.data.remark;
           }
         })
       },
@@ -1499,6 +1507,8 @@
         let params = {};
         params.record_data = value.record_data;
         params.is_testok = value.is_testok;
+        params.number = value.number;
+        params.remark = value.remark;
         putTestRecordItem(id, params).then((res) => {
           if (res.code >= 200) {
             that.recordVisible = false;
@@ -1523,28 +1533,10 @@
         params.id = value.id;
         params.is_testok = value.is_testok;
         params.record_data = value.record_data;
+        params.number = value.number;
+        params.remark = value.remark;
         that.params = params;
         that.limitedPhoto = true;
-        /*putTestRecordItem(id, params).then((res) => {
-          if (res.code >= 200) {
-            subTestRecordItem(id, params).then((res) => {
-              if (res.code >= 200) {
-                that.recordVisible = false;
-                that.limitedReview = false;
-                that.limitedCheckRecord = false;
-                that.getList();
-                that.getList2();
-                that.getList1();
-                that.getList3();
-                that.refreshRecord();
-              }
-            });
-          } else {
-            this.$message.error(res.msg)
-          }
-        }).catch((err) => {
-          this.$message.error(err);
-        });*/
       },
       checkSubmit(data) {
         debugger;