add: 6月薪需求

mes/qd/src/views/wms/pcs/orderproc/index.vue

@@ -124,6 +124,8 @@
         <el-table-column prop="contract_no" label="合同编码" />
         <el-table-column prop="price" label="无税单价" :formatter="crud.formatNum3" />
         <el-table-column prop="price_tax" label="含税单价" :formatter="crud.formatNum3" />
+        <el-table-column prop="purchase_organize" label="采购组织" width="160" />
+        <el-table-column prop="user_dept_name" label="使用部门" width="160" />
         <el-table-column prop="input_optname" label="导入人" />
         <el-table-column prop="update_optname" label="更新人" />
         <el-table-column prop="input_time" label="导入时间" width="150px" />

mes/qd/src/views/wms/pcs/receivemst/index.vue

@@ -74,6 +74,38 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="采购组织">
+            <el-select
+              v-model="query.purchase_organize"
+              clearable
+              style="width: 220px"
+              size="mini"
+              placeholder="采购组织"
+              class="filter-item"
+            >
+              <el-option
+                v-for="item in dict.purchase_organize"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="使用部门">
+            <el-select
+              v-model="query.use_dept_id"
+              clearable
+              style="width: 220px"
+              size="mini"
+              placeholder="使用部门"
+              class="filter-item"
+            >
+              <el-option
+                v-for="item in dict.use_dept"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="物料批次">
             <label slot="label">批&nbsp;&nbsp;&nbsp;&nbsp;次:</label>
 
@@ -245,6 +277,7 @@ import { downloadFile } from '@/utils'
 
 export default {
   name: 'Receivemst',
+  dicts: ['purchase_organize', 'use_dept'],
   components: { pagination, crudOperation, rrOperation, udOperation, DateRangePicker, AddShowDialog },
   mixins: [presenter(), header(), crud(), form()],
   cruds() {

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

@@ -138,6 +138,8 @@
         <el-table-column prop="end_name" min-width="80" label="结束人"/>
         <el-table-column prop="add_time" min-width="140" label="补料时间"/>
         <el-table-column prop="add_name" min-width="80" label="补料人"/>
+        <el-table-column prop="purchase_organize" label="采购组织" minwidth="140" />
+        <el-table-column prop="user_dept_name" label="使用部门" minwidth="140" />
       </el-table>
       <!--分页组件-->
       <pagination />

mes/qd/src/views/wms/st/inStor/moreOrless/AddDialog.vue

@@ -455,7 +455,14 @@ export default {
       this.nowrow = row
     },
     async insertdtl() {
-      this.form.tableData.push({ quality_scode: '02', ivt_qty: 0, mol_qty: 0, is_active: '1', ivt_level: '01', edit: false, is_add: true })
+      this.form.tableData.push({
+        struct_id: this.form.struct_id,
+        struct_code: this.form.struct_code,
+        struct_name: this.form.struct_name,
+        sect_id: this.form.sect_id,
+        quality_scode: '02',
+        ivt_qty: 0, mol_qty: 0,
+        is_active: '1', ivt_level: '01', edit: false, is_add: true })
       this.form.dtl_num = this.form.tableData.length
     },
     typeChange(val) {

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

@@ -191,6 +191,8 @@
         <el-table-column prop="warehousing_qty" label="待入数" :formatter="formatQty" min-width="100" />
         <el-table-column prop="qty_unit_name" label="单位" min-width="100" />
         <el-table-column prop="instorage_time" label="入库时间" minwidth="140" />
+        <el-table-column prop="purchase_organize" label="采购组织" minwidth="140" />
+        <el-table-column prop="user_dept_name" label="使用部门" minwidth="140" />
         <el-table-column v-permission="['admin','stockrecord_id:edit','stockrecord_id:del']" fixed="right" label="操作" width="70px" align="center">
           <template slot-scope="scope">
             <el-button type="danger" icon="el-icon-delete" size="mini" @click="doDelete(scope.row)" />

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

@@ -75,6 +75,22 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="采购组织">
+            <el-select
+              v-model="query.pk_org_v"
+              clearable
+              size="mini"
+              placeholder="采购组织"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in CGList"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="合同未到货重量">
             <div>
               <el-radio-group v-model="query.iszero" @change="crud.toQuery">
@@ -120,6 +136,7 @@
           <el-table-column prop="subscribedate" label="签订时间" width="150px" show-overflow-tooltip />
           <el-table-column prop="contract_no" label="合同编码" width="120px" show-overflow-tooltip/>
           <el-table-column prop="proc_status" label="处理状态" width="120px" show-overflow-tooltip/>
+          <el-table-column prop="pk_org_v" label="采购组织" width="120px" show-overflow-tooltip :formatter="formatCG" />
           <el-table-column prop="supp_name" label="供应商" min-width="220" show-overflow-tooltip/>
           <el-table-column prop="material_code" label="物料编码" min-width="150" show-overflow-tooltip />
           <el-table-column prop="material_name" label="物料名称" min-width="150" show-overflow-tooltip />
@@ -211,6 +228,10 @@ export default {
         { 'name': '在途', 'code': '在途' },
         { 'name': '完成', 'code': '完成' }
       ],
+      CGList: [
+        { 'value': '0001A11000000001MYHJ', 'label': '武汉公司' },
+        { 'value': '0001A110000000002IE5', 'label': '苏州公司' }
+      ],
       openParam: null,
       receiveDialog: false,
       remarkDaing: false
@@ -247,6 +268,15 @@ export default {
       }).catch(() => {
         crud.downloadLoading = false
       })
+    },
+    formatCG(row, column) {
+      if (row.pk_org_v === '0001A110000000002IE5') {
+        return '苏州公司'
+      } else if (row.pk_org_v === '0001A11000000001MYHJ') {
+        return '武汉公司'
+      } else {
+        return ''
+      }
     }
   }
 }

mes/qd/src/views/wms/statistics/materPlan/StructIvt3.vue

@@ -27,6 +27,21 @@
             :label="item.material_name"
             :value="item.material_id"
           />
+        </el-select>
+        采购组织:<el-select
+          v-model="queryrow.pk_org_v"
+          clearable
+          size="mini"
+          placeholder="请选择采购组织"
+          style="width: 200px"
+          class="filter-item"
+        >
+          <el-option
+            v-for="item in CGList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
         </el-select>
           供应商:<el-select
             v-model="queryrow.source_name"
@@ -82,6 +97,7 @@
     >
       <el-table-column type="index" label="序号" width="55" align="center" />
       <el-table-column prop="receive_code" label="合同号" min-width="100" />
+      <el-table-column prop="pk_org_v" label="采购组织" min-width="100" :formatter="formatCG" />
       <el-table-column prop="material_code" label="物料编码" min-width="150" />
       <el-table-column prop="material_name" label="物料名称" min-width="150" />
       <el-table-column prop="sumqty" label="合同重量" min-width="100" :formatter="crud.formatNum2" />
@@ -120,8 +136,12 @@ export default {
       tableDtl: [],
       cxjList: [],
       XLList: [],
+      CGList: [
+        { 'value': '0001A11000000001MYHJ', 'label': '武汉公司' },
+        { 'value': '0001A110000000002IE5', 'label': '苏州公司' }
+      ],
       fullscreenLoading: false,
-      queryrow: { material_id: '', source_name: '', hide: true },
+      queryrow: { material_id: '', source_name: '', hide: true, pk_org_v: '' },
       sortable: null,
       Depts: [],
       rows: []
@@ -284,6 +304,15 @@ export default {
       }).catch(() => {
         this.fullscreenLoading = false
       })
+    },
+    formatCG(row, column) {
+      if (row.pk_org_v === '0001A110000000002IE5') {
+        return '苏州公司'
+      } else if (row.pk_org_v === '0001A11000000001MYHJ') {
+        return '武汉公司'
+      } else {
+        return ''
+      }
     }
   }
 }