35

src/views/ProductionOrderList/Deliverylist/DeliveryDetail.vue

@@ -262,8 +262,8 @@ export default {
               "span",
               {},
               params.row.in_out_value == 0
-                ? "未确认"
-                : '已确认'
+                ? "未发货"
+                : '已发货'
             ),
         },
          {

src/views/ProductionOrderList/Dispatchlist/confirm.vue

@@ -35,6 +35,25 @@
         </div>
       </template>
     </FullPage>
+      <Modal
+       title="设置班组"
+        v-model="finish_modal"
+        width="400"
+      
+        @on-ok="finish_Ok">
+        <Form>
+          <FormItem label="完成班组:">
+              <Select v-model="finish_nickname" style="width:180px">
+                <Option
+                  :value="item.id"
+                  v-for="(item, index) in nickname_users"
+                  :key="index"
+                  >{{ item.nickname }}</Option
+                >
+              </Select>
+            </FormItem>
+        </Form>
+      </Modal>
   </div>
 </template>
 
@@ -42,6 +61,8 @@
 export default {
   data() {
     return {
+      finish_nickname:'',
+      finish_modal:false,
       type: 1,
       logList: [{ title: "系统单号", value: "10998765" }],
       tableColums: [
@@ -119,13 +140,15 @@ export default {
       url_number_list: [], 
       part_label: [],
       produce_type_list: [],
+      nickname_users:[],
+      params_data:[]
     };
   },
   created() {
     // this.axios("/api/procedure_index").then(
     //   (res) => (this.produces = res.data.data)
     // );
-    // this.axios("/api/employee_list").then((res) => (this.users = res.data));
+    this.axios("/api/employee_list").then((res) => (this.nickname_users = res.data));
   },
   computed: {
     list() {
@@ -196,6 +219,14 @@ export default {
     },
   },
   methods: {
+    finish_Ok(){
+      if(!this.finish_nickname){
+         this.$Message.warning('请选择班组')
+       
+      }else{
+               this.postData({...this.params_data,team_id:this.finish_nickname},1)
+      }
+    },
     search(row){
            row.start_time = row.start_time?new Date(row.start_time).getTime().toString().split('').splice(0,10).join(''):'';
       row.end_time =row.end_time? new Date(row.end_time).getTime().toString().split('').splice(0,10).join(''):'';
@@ -279,15 +310,8 @@ export default {
             )
           : row.produce_time,
       };
-      this.confirmDelete({
-        content: "是否手动操作此订单生产完成",
-        title: "生产完成",
-        type: "primary",
-        then: () => {
-          this.postData(params, type);
-        },
-        cancel: () => {},
-      });
+     this.finish_modal = true;
+     this.params_data = params;
     },
     selectTable(e) {
       this.selectIds = e;

src/views/ProductionOrderList/Dispatchlist/details.vue

@@ -40,7 +40,7 @@
           ghost
           >批量返工</Button
         >
-        <Button @click="finish(selectIds, 1)" type="success" ghost
+        <Button @click="finish(selectIds)" type="success" ghost
           >批量完成</Button
         >
       </div>
@@ -51,7 +51,7 @@
             v-if="row.sub_state < 3"
             class="map-margin"
             style="color:#32C800"
-            @click="finish(row, 1)"
+            @click="finish(row)"
             >完成</a
           >
           <a
@@ -162,13 +162,13 @@
         </Form>
       </Modal>
       <Modal
-       title="返工"
+       title="设置班组"
         v-model="finish_modal"
         width="400"
       
         @on-ok="finish_Ok">
         <Form>
-          <FormItem label="返工班组:">
+          <FormItem label="完成班组:">
               <Select v-model="finish_nickname" style="width:180px">
                 <Option
                   :value="item.id"
@@ -188,6 +188,7 @@
 export default {
   data() {
     return {
+      select_nickname:'',
       finish_modal:false,
       finish_nickname:'',
       formData:{
@@ -482,7 +483,12 @@ export default {
   },
   methods: {
     finish_Ok(){
-           
+      if(!this.finish_nickname){
+        this.$Message.warning('请选择班组')
+      }else{
+           this.postData({id:this.select_nickname,...this.$route.query,team_id:this.finish_nickname},1)
+      }
+       
     },
     download(){
       this.axios.get('/api/nc_export').then(res=>{
@@ -606,6 +612,7 @@ export default {
           //若没有选择产品
           if (row.length == 0) {
             this.$Message.warning("请选择产品!");
+            this.modal8 = false;
           } else {
             this.form_modal.procedure_title = [];
             //选择了请求班组数据
@@ -666,14 +673,17 @@ export default {
            let data = {};
       data = {...this.formData,...this.$route.query};
           this.getData(data);
+          this.selectIds = [];
         }
       });
     },
-    finish(row, type) {
+    finish(row) {
       if (!row || row.length < 1) {
         return this.$Message.warning("请至少选择一项");
       }
       let str = Array.isArray(row) ? row.join(",") : row.id;
+      this.select_nickname = str;
+      console.log(this.select_nickname)
      this.finish_modal = true;
     },
     selectTable(e) {

src/views/ProductionOrderList/workOver/confirm.vue

@@ -29,6 +29,25 @@
                 </div>
             </template>
         </FullPage>
+         <Modal
+       title="设置班组"
+        v-model="finish_modal"
+        width="400"
+      
+        @on-ok="finish_Ok">
+        <Form>
+          <FormItem label="完成班组:">
+              <Select v-model="finish_nickname" style="width:180px">
+                <Option
+                  :value="item.id"
+                  v-for="(item, index) in username_list"
+                  :key="index"
+                  >{{ item.nickname }}</Option
+                >
+              </Select>
+            </FormItem>
+        </Form>
+      </Modal>
     </div>
 </template>
 
@@ -36,6 +55,10 @@
 export default {
     data(){
         return {
+          finish_nickname:'',
+          finish_modal:false,
+          username_list:[],
+          select_id:'',
             form_modal:{
                 nickname:[],
                 user_id:'',
@@ -65,7 +88,8 @@ export default {
                 // {title:'贴标签零部件',align:'center',minWidth:150,key:'sub_part'},
                 {title:'工序分类',align:'center',minWidth:150,key:'basic_title'},
                 {title:'工序',align:'center',minWidth:150,key:'procedure_title'},
-                {title:'班组',align:'center',minWidth:150,key:'nickname'},
+                {title:'返工班组',align:'center',minWidth:150,key:'nickname'},
+                {title:'完工班组',align:'center',minWidth:150,key:'finish_nickname'},
                 {title:'测量尺寸',align:'center',minWidth:150,key:'measure'},
                 {title:'单位',align:'center',minWidth:100,key:'company'},
                 {title:'芯片编号',align:'center',minWidth:150,key:'chip'},
@@ -218,9 +242,19 @@ export default {
     },
     },
     mounted(){
-        this.getData(this.$route.query)
+        this.getData(this.$route.query);
+        this.axios("/api/employee_list").then((res) => {
+      this.username_list = res.data;
+    });
     },
     methods:{
+      finish_Ok(){
+  if(!this.finish_nickname){
+        this.$Message.warning('请选择班组')
+      }else{
+           this.postData({id:this.select_id,...this.$route.query,team_id:this.finish_nickname},1)
+      }
+      },
       search(row){
         console.log(row)
              row.page_size = this.pageSize
@@ -324,23 +358,17 @@ export default {
             this.axios.post(url,data).then(res=>{
                 if(res.code == 200){
                     this.$Message.success(res.msg);
-                    this.getData(this.$route.query)
+                    this.getData(this.$route.query);
+                    this.selectIds = [];
                 }
             })
         },
         finish(row,type){
-            if(!row||row.length<1){return this.$Message.warning('请至少选择一项')}
+            if(!row||row.length<1){return this.$Message.warning('请至少选择一项')};
+            this.finish_nickname = '';
             let str = Array.isArray(row) ? row.join(',') : row.id
-            this.confirmDelete({
-                content:type == 1 ? '是否手动操作此订单生产完成' : '确认驳回？',
-                title:type == 1 ? '生产完成' : '驳回',
-                type:type == 1 ? 'primary' : 'error',
-                then:()=>{
-                    this.postData({id:str},type)
-                    
-                },
-                cancel:()=>{}
-            })
+           this.select_id = str;
+           this.finish_modal = true;
         },
         selectTable(e){
            

src/views/ProductionOrderList/workOver/details.vue

@@ -37,6 +37,25 @@
         </div>
       </template>
     </FullPage>
+     <Modal
+       title="设置班组"
+        v-model="finish_modal"
+        width="400"
+      
+        @on-ok="finish_Ok">
+        <Form>
+          <FormItem label="完成班组:">
+              <Select v-model="finish_nickname" style="width:180px">
+                <Option
+                  :value="item.id"
+                  v-for="(item, index) in username_list"
+                  :key="index"
+                  >{{ item.nickname }}</Option
+                >
+              </Select>
+            </FormItem>
+        </Form>
+      </Modal>
   </div>
 </template>
 
@@ -44,6 +63,10 @@
 export default {
   data() {
     return {
+      finish_modal:false,
+      finish_nickname:'',
+      username_list:[],
+      finish_data:{},
       type: 1,
       logList: [{ title: "系统单号", value: "10998765" }],
       tableColums: [
@@ -137,7 +160,7 @@ export default {
     //   (res) => {
     //     this.unit_list = res.data.data}
     // );
-    // this.axios("/api/employee_list").then((res) => (this.level_list = res.data));
+    this.axios("/api/employee_list").then((res) => (this.username_list = res.data));
   },
   computed: {
     list() {
@@ -197,6 +220,14 @@ export default {
     },
   },
   methods: {
+     finish_Ok(){
+      if(!this.finish_nickname){
+        this.$Message.warning('请选择班组')
+      }else{
+           this.postData({...this.finish_data,team_id:this.finish_nickname},1)
+      }
+       
+    },
     search(row){
       console.log(row)
        row.start_time = row.start_time?new Date(row.start_time).getTime().toString().split('').splice(0,10).join(''):'';
@@ -327,15 +358,8 @@ export default {
             )
           : row.produce_time,
       };
-      this.confirmDelete({
-        content: "是否手动操作此订单生产完成",
-        title: "生产完成",
-        type: "primary",
-        then: () => {
-          this.postData(params, type);
-        },
-        cancel: () => {},
-      });
+     this.finish_modal = true;
+     this.finish_data = params;
     },
     selectTable(e) {
       this.selectIds = e;

src/views/ProductionOrderList/workOver/list.vue

@@ -197,6 +197,7 @@ export default {
     init (row) {
       row.page_index = this.page_index;
       row.page_size = this.page_size;
+      console.log(1)
       if (this.firstEnter == 1) {
         this.corssPageData = JSON.parse(localStorage.getItem('corssPageData'))
         row = this.corssPageData

src/views/leadMatch/MatchList/matchPage.vue

@@ -824,7 +824,7 @@ export default {
           align: "center",
           minWidth: 80,
           render: (h, params) => {
-            return h("span", {}, params.row.board1 + ";" + params.row.board2);
+            return h("span", {}, params.row.board1 + (params.row.board2?(';'+params.row.board2):''));
           },
         },
         { title: "木皮2", align: "center", key: "skin2", minWidth: 60 },
@@ -875,7 +875,7 @@ export default {
           align: "center",
           minWidth: 100,
           render: (h, params) => {
-            return h("span", {}, params.row.board1 + ";" + params.row.board2);
+            return h("span", {}, params.row.board1 + (params.row.board2?(';'+params.row.board2):''));
           },
         },
         { title: "木皮2", align: "center", key: "skin2", minWidth: 100 },