1

qd/src/api/acs/order/order.js

@@ -83,6 +83,21 @@ export function order_pause(data) {
   })
 }
 
+export function send_letteringMess(data) {
+  return request({
+    url: 'api/produceshiftorder/send_letteringMess',
+    method: 'post',
+    data
+  })
+}
+
+export function send_labelingMess(data) {
+  return request({
+    url: 'api/produceshiftorder/send_labelingMess',
+    method: 'post',
+    data
+  })
+}
 export function order_force_complete(data) {
   return request({
     url: 'api/produceshiftorder/order_force_complete',
@@ -114,6 +129,13 @@ export function selectTemplateList() {
   })
 }
 
+export function selectColortypeList() {
+  return request({
+    url: 'api/produceshiftorder/selectColortypeList',
+    method: 'get'
+  })
+}
+
 export function reload() {
   return request({
     url: 'api/produceshiftorder/reload',
@@ -122,4 +144,4 @@ export function reload() {
 }
 
 export default { add, edit, del, importExcel, getDtl, send, device_pause, device_restore, clear, stop, order_pause, order_force_complete, detail_pause, detail_force_complete,
-  selectTemplateList, reload }
+  selectTemplateList, selectColortypeList, reload, send_letteringMess, send_labelingMess }

qd/src/views/acs/order/AddDialog.vue

@@ -94,16 +94,16 @@
       :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
     >
       <el-table-column type="index" label="序号" width="55" align="center" />
-      <el-table-column prop="customer_code" label="客户编码" align="center">
-        <template scope="scope">
-          <el-input v-show="!scope.row.edit" v-model="scope.row.cust_code" size="mini">
+      <el-table-column prop="customer_code" label="客户编码"  width="150" align="center">
+        <template scope="scope" >
+          <el-input v-show="!scope.row.edit" v-model="scope.row.cust_code"  width="100" size="mini">
             <el-button slot="append" icon="el-icon-plus" @click="queryCustomer(scope.$index, scope.row)" />
           </el-input>
           <span v-show="!scope.row.edit && mater_btn">{{ scope.row.custcode }}</span>
           <span v-show="scope.row.edit">{{ scope.row.cust_code }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="customer_name" label="客户名称" align="center">
+      <el-table-column prop="customer_name" label="客户名称"  width="100" align="center">
         <template scope="scope">
           <el-input v-show="!scope.row.edit" v-model="scope.row.cust_name" size="mini" />
           <span v-show="scope.row.edit">{{ scope.row.cust_name }}</span>
@@ -145,13 +145,13 @@
           <span v-show="scope.row.edit">{{ scope.row.mg_weight }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="lettering_message" label="图标前刻字信息" align="center">
+      <el-table-column prop="lettering_message"  width="100" label="图标前刻字信息" align="center">
         <template scope="scope">
           <el-input v-show="!scope.row.edit" v-model="scope.row.lettering_message" size="mini" />
           <span v-show="scope.row.edit">{{ scope.row.lettering_message }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="lettering_icon" label="刻字图标" align="center">
+      <el-table-column prop="lettering_icon" label="刻字图标"  width="120" align="center">
         <template scope="scope">
           <el-select
             v-model="scope.row.lettering_icon"
@@ -167,34 +167,50 @@
           </el-select>
         </template>
       </el-table-column>
-      <el-table-column prop="lettering_message2" label="图标后刻字信息" align="center">
+      <el-table-column prop="lettering_message2"  width="100" label="图标后刻字信息" align="center">
         <template scope="scope">
           <el-input v-show="!scope.row.edit" v-model="scope.row.lettering_message2" size="mini" />
           <span v-show="scope.row.edit">{{ scope.row.lettering_message2 }}</span>
         </template>
       </el-table-column>
+      <el-table-column prop="color_type"  label="套冒颜色" align="center">
+        <template scope="scope">
+          <el-select
+            v-model="scope.row.color_type"
+            clearable
+            class="filter-item"
+          >
+            <el-option
+              v-for="item in colortypeList"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
       <el-table-column prop="strap_number" label="捆扎每包数量" align="center">
         <template scope="scope">
           <el-input v-show="!scope.row.edit" v-model="scope.row.strap_number" size="mini" />
           <span v-show="scope.row.edit">{{ scope.row.strap_number }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="labeling_template" label="贴标模板" align="center">
-        <template scope="scope">
-          <el-select
-            v-model="scope.row.labeling_template"
-            clearable
-            class="filter-item"
-          >
-            <el-option
-              v-for="item in templateList"
-              :key="item.template_id"
-              :label="item.template_name"
-              :value="item.template_code"
-            />
-          </el-select>
-        </template>
-      </el-table-column>
+<!--      <el-table-column prop="labeling_template" label="贴标模板" align="center">-->
+<!--        <template scope="scope">-->
+<!--          <el-select-->
+<!--            v-model="scope.row.labeling_template"-->
+<!--            clearable-->
+<!--            class="filter-item"-->
+<!--          >-->
+<!--            <el-option-->
+<!--              v-for="item in templateList"-->
+<!--              :key="item.template_id"-->
+<!--              :label="item.template_name"-->
+<!--              :value="item.template_code"-->
+<!--            />-->
+<!--          </el-select>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <!--      <el-table-column prop="priority" label="优先级" align="center">-->
       <!--        <template scope="scope">-->
       <!--          <el-input v-show="!scope.row.edit" v-model="scope.row.priority" size="mini" />-->
@@ -293,6 +309,7 @@ import { getToken } from '@/utils/auth'
 import { mapGetters } from 'vuex'
 import CustomerDtl from '@/views/acs/order/CustomerDialog'
 import CRUD, { crud, form } from '@crud/crud'
+import { get } from '@/api/system/dictDetail'
 const defaultForm = { tableData: [], order_code: null, material_code: null, material_spec: null,
   outer_diameter: null, wall_thickness: null, detail_count: 0 }
 
@@ -328,6 +345,7 @@ export default {
       dtlJson: null,
       dtlIndex: null,
       dtlShow: false,
+      colortypeList: [],
       templateList: [],
       opendtlParam: null,
       bill_btn: false,
@@ -384,6 +402,10 @@ export default {
     debugger
     crudProduceshiftorder.selectTemplateList().then(data => {
       this.templateList = data
+    }),
+    // 获取区域类型
+    get('color_type').then(data => {
+      this.colortypeList = data.content
     })
   },
   methods: {

qd/src/views/acs/order/sorting/index.vue

@@ -44,17 +44,28 @@
         >
           清料
         </el-button>
-<!--        <el-button-->
-<!--          slot="right"-->
-<!--          class="filter-item"-->
-<!--          type="success"-->
-<!--          icon="el-icon-position"-->
-<!--          :disabled="crud.selections.length !== 1"-->
-<!--          size="mini"-->
-<!--          @click="order_pause"-->
-<!--        >-->
-<!--          工单暂停-->
-<!--        </el-button>-->
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-position"
+          :disabled="crud.selections.length !== 1"
+          size="mini"
+          @click="send_letteringMess(crud.selections)"
+        >
+          手动下发刻字信息
+        </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-position"
+          :disabled="crud.selections.length !== 1"
+          size="mini"
+          @click="send_labelingMess(crud.selections)"
+        >
+          手动下发贴标信息
+        </el-button>
       </crudOperation>
       <!--表格渲染-->
       <el-table
@@ -113,6 +124,8 @@
         <el-table-column prop="present_strap_number" label="当前捆扎数" />
         <el-table-column prop="present_wraping_number" label="当前裹膜数量" />
         <el-table-column prop="qualified_wraping_number" label="当前裹膜合格数量" />
+        <el-table-column prop="present_labeling_number" label="当前贴标数量" />
+<!--        <el-table-column prop="qualified_wraping_number" label="当前贴标合格数量" />-->
         <el-table-column prop="feeding_finished" label="上料完成" >
           <template slot-scope="scope">
             <span v-if="scope.row.feeding_finished==='0' && scope.row.is_flag ==='0' ">否</span>
@@ -159,9 +172,9 @@
         <el-table-column prop="create_time" label="创建时间" />
         <el-table-column label="操作" width="200px" align="center" fixed="right">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.is_flag ==='1'" type="text" size="small" @click="handleClick(scope.row,'1')">暂停工单</el-button>
+<!--            <el-button v-if="scope.row.is_flag ==='1'" type="text" size="small" @click="handleClick(scope.row,'1')">暂停工单</el-button>-->
             <el-button v-if="scope.row.is_flag ==='1'" type="text" size="small" @click="handleClick(scope.row,'2')">强制完成工单</el-button>
-            <el-button v-if="scope.row.is_flag ==='0'" type="text" size="small" @click="handleClick(scope.row,'3')">暂停明细</el-button>
+<!--            <el-button v-if="scope.row.is_flag ==='0'" type="text" size="small" @click="handleClick(scope.row,'3')">暂停明细</el-button>-->
             <el-button v-if="scope.row.is_flag ==='0'" type="text" size="small" @click="handleClick(scope.row,'4')">强制完成明细</el-button>
           </template>
         </el-table-column>
@@ -401,6 +414,24 @@ export default {
         console.log(err.response.data.message)
       })
     },
+    send_letteringMess(data) {
+      debugger
+      crudProduceshiftorder.send_letteringMess(data[0]).then(res => {
+        this.crud.toQuery()
+        this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      }).catch(err => {
+        console.log(err.response.data.message)
+      })
+    },
+    send_labelingMess(data) {
+      debugger
+      crudProduceshiftorder.send_labelingMess(data[0]).then(res => {
+        this.crud.toQuery()
+        this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      }).catch(err => {
+        console.log(err.response.data.message)
+      })
+    },
     handleExceed(files, fileList) {
       this.$message.warning('当前限制只能选择 1 个文件')
     },