优化

mes/qd/src/views/wms/pdm/produce/dailyplan/AddDialog.vue

@@ -97,6 +97,14 @@
             :value="item.id"
           /></el-select>
       </el-form-item>
+      <el-form-item label="是否外协" prop="is_out">
+        <label slot="label">是否外协:</label>
+        <el-radio v-model="form.is_out" label="1" >是</el-radio>
+        <el-radio v-model="form.is_out" label="0" >否</el-radio>
+      </el-form-item>
+      <el-form-item label="发货日期" prop="send_date">
+        <el-date-picker v-model="form.send_date" value-format="yyyy-MM-dd" type="date" style="width: 210px" :disabled="crud.status.view > 0" />
+      </el-form-item>
       <el-form-item label="备注" prop="remark">
         <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
         <el-input v-model.trim="form.remark" style="width: 480px;" rows="3" type="textarea" :disabled="crud.status.view > 0" />
@@ -126,9 +134,11 @@ const defaultForm = {
   plan_org_code: '',
   plan_org_name: '',
   status: '10',
+  is_out: '0',
   product_series_id: '',
   product_weight: '500',
   workorder_type: '02',
+  send_date: '',
   remark: '',
   plan_finish_date: new Date().daysLater(5),
   planstart_date: new Date().daysLater(5)

mes/qd/src/views/wms/pdm/produce/workorder/AddDialog.vue

@@ -70,6 +70,14 @@
         <el-radio v-model="form.is_experiment" label="1" @change="storChange">是</el-radio>
         <el-radio v-model="form.is_experiment" label="0" @change="storChange">否</el-radio>
       </el-form-item>
+      <el-form-item label="发货日期" prop="send_date">
+        <el-date-picker v-model="form.send_date" value-format="yyyy-MM-dd" type="date" style="width: 210px" :disabled="crud.status.view > 0" />
+      </el-form-item>
+      <el-form-item label="是否外协" prop="is_out">
+        <label slot="label">是否外协:</label>
+        <el-radio v-model="form.is_out" label="1">是</el-radio>
+        <el-radio v-model="form.is_out" label="0">否</el-radio>
+      </el-form-item>
       <el-form-item label="生产批次" prop="pcsn">
         <label slot="label">生产批次:</label>
         <el-input v-model.trim="form.pcsn" style="width: 210px" disabled class="input-with-select">
@@ -106,7 +114,7 @@
             :value="item.id"
           /></el-select>
       </el-form-item>
-      <el-form-item label="批数" prop="pcsn_num">
+      <el-form-item v-show="crud.status.add === 1" label="批数" prop="pcsn_num">
         <label slot="label">批数:</label>
         <el-input-number
           v-show="crud.status.add === 1"
@@ -153,8 +161,10 @@ const defaultForm = {
   workorder_qty: '500',
   workorder_type: '01',
   is_experiment: '0',
+  is_out: '0',
   pcsn_num: '1',
   remark: '',
+  send_date: '',
   planstart_time: ''
 }
 export default {

mes/qd/src/views/wms/pdm/produce/workorder/ViewDialog.vue

@@ -67,6 +67,14 @@
         <el-radio v-model="form.is_experiment" label="1" disabled>是</el-radio>
         <el-radio v-model="form.is_experiment" label="0" disabled>否</el-radio>
       </el-form-item>
+      <el-form-item label="发货日期" prop="send_date">
+        <el-date-picker disabled v-model="form.send_date" value-format="yyyy-MM-dd" type="date" style="width: 210px" />
+      </el-form-item>
+      <el-form-item label="是否外协" prop="is_out">
+        <label slot="label">是否外协:</label>
+        <el-radio v-model="form.is_out" label="1" disabled>是</el-radio>
+        <el-radio v-model="form.is_out" label="0" disabled>否</el-radio>
+      </el-form-item>
       <el-form-item label="生产批次" prop="pcsn">
         <label slot="label">生产批次:</label>
         <el-input v-model.trim="form.pcsn" style="width: 210px" disabled />

mes/qd/src/views/wms/pf/initformula/index.vue

@@ -155,7 +155,6 @@
         <el-table-column prop="bill_qty" min-width="90" label="开单总重量" :formatter="crud.formatNum3" />
         <el-table-column prop="planstart_time" label="计划开始日期" min-width="100" :formatter="workorder_dateFormat" />
         <el-table-column prop="planend_time" label="计划结束日期" min-width="100" :formatter="workorder_dateFormat3" />
-        <el-table-column prop="formula_time" min-width="135" label="开单时间"/>
         <el-table-column  :formatter="create_modeFormat" min-width="160" prop="create_mode" label="生成方式" />
         <el-table-column prop="qty_unit_name" min-width="80" label="单位"/>
         <el-table-column prop="workorder_type" :formatter="bill_typeFormat" min-width="75" label="工令类型" />

mes/qd/src/views/wms/statistics/sendOutQuery/index.vue

@@ -0,0 +1,283 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="80px"
+          label-suffix=":"
+        >
+          <el-form-item label="物料">
+            <el-input
+              v-model="query.material_code"
+              clearable
+              size="mini"
+              placeholder="请输入物料编码或名称"
+              style="width: 210px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="批次">
+            <el-input
+              v-model="query.pcsn"
+              clearable
+              size="mini"
+              placeholder="请输入批次"
+              style="width: 210px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="计划发货日期">
+            <label slot="label">计划发货日期:</label>
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+            />
+          </el-form-item>
+          <el-form-item label="所属组织">
+            <el-select
+              v-model="query.org_id"
+              clearable
+              size="mini"
+              style="width: 210px;"
+              placeholder="所属组织"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in Depts"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="工令号">
+            <label slot="label">工令号:</label>
+            <el-input
+              v-model="query.workorder_code"
+              clearable
+              size="mini"
+              placeholder="请输入工令号"
+              style="width: 210px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="发货人">
+            <label slot="label">发货人:</label>
+            <el-input
+              v-model="query.send_name"
+              clearable
+              size="mini"
+              placeholder="请输入发货人"
+              style="width: 210px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="是否发货">
+            <el-select
+              v-model="query.is_send"
+              clearable
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+              style="width: 210px;"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in passList"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <rrOperation />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <!--表格渲染-->
+      <el-table ref="table" :max-height="590" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;"
+                @selection-change="crud.selectionChangeHandler"
+                @current-change="handleCurrentChange"
+                @select="handleSelectionChange"
+                @select-all="onSelectAll"
+      >
+        <el-table-column prop="send_date" label="计划发货日期" width="120px" />
+        <el-table-column prop="workorder_code" label="工令号" width="120px" />
+        <el-table-column prop="org_id" label="所属组织" width="120px" :formatter="orgFormat" />
+        <el-table-column prop="material_code" label="物料编码" width="120px" />
+        <el-table-column prop="pcsn" label="批次" min-width="100" />
+        <el-table-column prop="workorder_qty" label="重量" width="150px" />
+        <el-table-column prop="workorder_status" label="工令状态" width="150px" :formatter="stateFormat" />
+        <el-table-column prop="storagevehicle_code" label="托盘号" />
+        <el-table-column prop="num_bucket" label="桶数" />
+        <el-table-column prop="total_qty" label="托盘重量" min-width="120px"/>
+        <el-table-column prop="create_name" label="组盘人" />
+        <el-table-column prop="create_time" label="组盘时间" min-width="150px" />
+        <el-table-column prop="is_send" label="是否已发货" min-width="120px" :formatter="formatResult" />
+        <el-table-column prop="send_name" label="发货人" />
+        <el-table-column prop="send_time" label="发货时间" min-width="150px" />
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import crudInspectionsheetmst from '@/api/wms/ql/inspectionsheetmst'
+import CRUD, { presenter, header, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import DateRangePicker from '@/components/DateRangePicker'
+import AddDialog from '@/views/wms/ql/inspectionsheet/AddDialog'
+import ResultPutDialog from '@/views/wms/ql/inspectionsheet/ResultPutDialog'
+import Date from '@/utils/datetime'
+import workorder from '@/api/wms/pdm/workorder'
+
+export default {
+  name: 'SendOutQuery',
+  dicts: ['workorder_status', 'ST_INV_TYPE_RC'],
+  components: { pagination, crudOperation, rrOperation },
+  mixins: [presenter(), header(), crud()],
+  cruds() {
+    return CRUD({
+      title: '外协发货查询',
+      url: 'api/statistical/sendOutQuery',
+      idField: 'inspection_id',
+      sort: '',
+      props: {
+        // 每页数据条数
+        size: 20
+      },
+      crudMethod: { ...crudInspectionsheetmst },
+      optShow: {
+        add: false,
+        edit: false,
+        del: false,
+        download: false,
+        reset: true
+      }})
+  },
+  data() {
+    return {
+      statusList: [],
+      resultList: [],
+      currentRow: {},
+      Depts: [],
+      resultPutDialog: false,
+      openParam: {},
+      query_flag: true,
+      passList: [
+        { 'label': '是', 'value': '1' },
+        { 'label': '否', 'value': '0' }
+      ],
+      permission: {
+      }
+    }
+  },
+  created() {
+    crudInspectionsheetmst.getStatus().then(res => {
+      this.statusList = res
+    })
+    workorder.getDepts().then(res => {
+      this.Depts = res
+    })
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+    },
+    handleSelectionChange(val, row) {
+      if (val.length > 1) {
+        this.$refs.table.clearSelection()
+        this.$refs.table.toggleRowSelection(val.pop())
+        this.buttonChange(row)
+      } else if (val.length === 1) {
+        this.buttonChange(row)
+      }else{
+        this.handleCurrentChange(null)
+      }
+    },
+    onSelectAll() {
+      this.$refs.table.clearSelection()
+      this.handleCurrentChange(null)
+    },
+    orgFormat(row) {
+      for (const item of this.Depts) {
+        if (item.id === row.org_id) {
+          return item.name
+        }
+      }
+    },
+    hand(value) {
+      this.crud.toQuery()
+    },
+    buttonChange(current) {
+      if (current !== null) {
+        this.currentRow = current
+      }
+    },
+    onInput() {
+      this.$forceUpdate()
+    },
+    mytoQuery(array1){
+      if(array1 === null){
+        this.crud.query.begin_time = ''
+        this.crud.query.end_time = ''
+      }else{
+        this.crud.query.begin_time = array1[0]
+        this.crud.query.end_time = array1[1]
+      }
+      this.crud.toQuery()
+    },
+    handleCurrentChange(current) {
+      if (current === null) {
+        this.currentRow = {}
+      }
+    },
+    formatStatus(row, column) {
+      for (const item of this.statusList) {
+        if (item.value === row.bill_status) {
+          return item.label
+        }
+      }
+    },
+    formatResult(row) {
+      if (row.is_send === '1') {
+        return '是'
+      } else return '否'
+    },
+    stateFormat(row) {
+      return this.dict.label.workorder_status[row.workorder_status]
+    },
+    querytable() {
+      this.onSelectAll()
+      this.crud.toQuery()
+      this.handleCurrentChange(null)
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>