xiugai

hb_client/src/views/inm/materialbatch.vue

@@ -47,10 +47,15 @@
            <el-table-column label="规格型号">
           <template slot-scope="scope">{{ scope.row.material_.specification }}</template>
         </el-table-column>
-           <el-table-column label="有效期">
-          <template slot-scope="scope">{{ scope.row.expiration_date }}</template>
+          
+        <el-table-column label="有效期" >
+          <template slot-scope="scope">
+              <el-tag v-if="scope.row.expiration_date" :type="setClass(scope.row.expiration_date)">
+                    {{scope.row.expiration_date}}
+                  </el-tag>
+                  <div v-else></div></template
+          >
         </el-table-column>
-      
         <el-table-column label="物料编号">
           <template slot-scope="scope">{{
             scope.row.material_.number
@@ -130,7 +135,23 @@ export default {
         this.listLoading = false;
       });
     },
-
+//校准时间提醒
+    setClass:function(check_date) {
+        let obj = {};
+        if(check_date!=null){
+          let dat = new Date();
+          let time = dat.getTime();
+          let check = new Date(check_date).getTime();
+          let timeDiffer = (check-time)/1000/60/60/24;
+          if (timeDiffer<0) {
+            obj = "danger";
+          }
+          
+            
+          
+        }
+        return obj;
+      },
     handleFilter() {
       this.listQuery.page = 1;
       this.getList();

hb_client/src/views/sam/salesdetail.vue

@@ -26,7 +26,7 @@
           {{ salesdetail.order_.number }}
         </el-descriptions-item>
          <el-descriptions-item label="物流详情" v-if="ship_pic!=''">
-          <el-link :href="salesdetail.ship_pic">物流单</el-link></el-descriptions-item>
+          <el-link  type="primary" :href="salesdetail.ship_pic">物流单</el-link></el-descriptions-item>
       </el-descriptions>
       <el-button type="primary" style="margin-top:10px" @click="upload">上传物流信息</el-button>
     </el-card>
@@ -295,6 +295,7 @@ export default {
       },
       handleUpSuccess(res, file, filelist) {
         this.ship.path = res.data.path;
+        this.salesdetail.ship_pic=res.data.path;
         console.log(this.ship.path)
       },
       handleRemove(file, filelist){

hb_client/src/views/wpm/need.vue

@@ -168,8 +168,7 @@
             <el-table-column label="子计划编号">
               <template slot-scope="scope">{{ scope.row.subproduction_plan_.number }}</template>
             </el-table-column>
-            <el-table-column label="所在子工序"
-                             :filters="[{ text: '切割', value: '切割' },{ text: '磨边', value: '磨边' },
+            <el-table-column label="所在子工序" :filters="[{ text: '切割', value: '切割' },{ text: '磨边', value: '磨边' },
             { text: '清洗', value: '清洗' }, { text: '热弯成型', value: '热弯成型' },{ text: '化学钢化', value: '化学钢化' },
             { text: '镀膜', value: '镀膜' }, { text: '断膜', value: '断膜' },{ text: '汇流条制备', value: '汇流条制备' },
             { text: '夹层', value: '夹层' }, { text: '包边', value: '包边' }]"

hb_client/src/views/wpm/worktask.vue

@@ -943,7 +943,13 @@
         //车间物料表
         this.getwmaterialLists();
         // 半成品表
-        this.getwproductLists();
+        getwproductList({page:0,tag:'no_scrap'}).then((response) => {
+          if (response.data) {
+            this.wproductData = response.data;
+            //console.log( this.wproductData)
+          }
+        });
+    
       },
 
       //大工序下子工序产出的半成品
@@ -1017,6 +1023,14 @@
             this.dialogVisiblenw = false;
 
             this.$message.success("领料成功！");
+            
+        this.listQuery.process =  this.process;
+       
+        getsubplanList(this.listQuery).then((response) => {
+          if (response.data) {
+            this.subproductionplanList = response.data;
+          }
+        });
             //车间物料表
             this.getwmaterialLists();
             // 半成品表