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

hb_client/src/api/mtm.js

@@ -272,6 +272,13 @@ export function createUsedstep(data) {
     data
   })
 }
+export function updateUsedstep(id,data) {
+  return request({
+    url: `/mtm/usedstep/${id}/`,
+    method: 'put',
+    data
+  })
+}
 export function deleteUsedstep(id, data) {
   return request({
     url: `/mtm/usedstep/${id}/`,

hb_client/src/components/customForm/index.vue

@@ -196,10 +196,6 @@
       isDisabled:{
         type:Boolean,
         default:false
-      },
-      isMidTesting:{
-        type:Boolean,
-        default:false
       }
     },
     mounted() {
@@ -235,13 +231,11 @@
       let listJudge = this.formData.filter(item => {
         return item.need_judge === true;
       });
-      debugger;
       listJudge.forEach(item => {
         let obj = new Object();
         obj = item;
         that.judgeList.push(obj)
       });
-      debugger;
       let  imag= this.formData.filter(item => {
         return item.field_type === 'draw';
       });
@@ -727,7 +721,7 @@
         that.testrecord.record_data = that.field;//检查项列表
         that.testrecord.is_testok = that.is_testok;//检查表检查结果
         that.testrecord.id = that.recordId;//记录id
-        if(submit&&that.isMidTesting!==true){//提交
+        if(submit){//提交
           this.$emit('recordSubmit',that.testrecord);
         }else {//保存
           this.$emit('recordSave',that.testrecord);

hb_client/src/components/customForm/review.vue

@@ -818,7 +818,8 @@
         that.testrecord.is_testok = that.is_testok;//检查表检查结果
         that.testrecord.id = that.recordId;
         // debugger;
-        if(submit&&that.isMidTesting!==true){//提交
+        // if(submit&&that.isMidTesting!==true){//提交
+        if(submit){//提交
           this.$emit('recordSubmit',that.testrecord);
         }else {//保存
           this.$emit('recordSave',that.testrecord);

hb_client/src/views/inm/product.vue

@@ -257,7 +257,7 @@ export default {
         _this.mtmId.push(item.material_.id);
          _this.materialshow.push(item);
       });
-      this.ordershow = _this.materialshow[0].number;
+      this.ordershow = _this.materialshow[0].to_order_.number;
       this.customershow=_this.materialshow[0].order_.customer_.name;
        this.contractshow=_this.materialshow[0].order_.contract_.name;
       getOrderList({ page: 0, material: _this.mtmId[0], tag:'not_done' }).then(

hb_client/src/views/personnel/attendance.vue

@@ -53,7 +53,7 @@
       type="month"
       placeholder="选择年月">
     </el-date-picker>
-     <el-button type="primary" @click="submit">主要按钮</el-button>
+     <el-button type="primary" @click="submit">查询</el-button>
    </div>
  
      <el-table

hb_client/src/views/procurement/puorder.vue

@@ -56,7 +56,9 @@
             <el-tag v-else-if="scope.row.is_audited == true">已审核</el-tag>
           </template>
         </el-table-column>
-
+  <el-table-column label="创建时间">
+          <template slot-scope="scope">{{ scope.row.create_time }}</template>
+        </el-table-column>
         <el-table-column align="center" label="操作" width="220px">
           <template slot-scope="scope">
             <el-link

hb_client/src/views/wpm/need.vue

@@ -1011,7 +1011,9 @@
         this.innerIndex = index;
         // this.outerVisible = true;
         this.wproduct = scope.row.id;//半成品ID
-        this.listQueryrecordform.material = scope.row.material_check!==null ? scope.row.material_check :scope.row.material_.id;//
+        debugger;
+        console.log(scope.row.material_check);
+        this.listQueryrecordform.material = scope.row.material_check!==null ? scope.row.material_check :scope.row.material;//
         this.listQueryrecordform.type = 2;
          this.listQueryrecordform.enabled = true;
         this.recordform = null;