完善采购申请

yxt-as-ui/src/api/Common/dictcommons.js

@@ -58,6 +58,14 @@ export function getButtonPermissions(data) {
   })
 }
 
+// 获取集团所有在职人员
+export function selectStaffListss() {
+  return request({
+    url: '/portal/v1/sysstaffinfo/selectStaffListss',
+    method: 'get'
+  })
+}
+
 // 根据当前登录用户的全路径查询相应部门下的所有人
 export function selAllByOrgSidPath(data) {
   return request({

yxt-as-ui/src/views/purchase/procurement/procurement.vue

@@ -205,7 +205,9 @@ export default {
           payTypeValue: '',
           supplierName: '',
           isInvoicing: '',
-          orgPath: ''
+          orgPath: '',
+          menuUrl: '',
+          userSid: ''
         }
       }
     }
@@ -308,6 +310,8 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.menuUrl = this.$route.path
       this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
       req.listPage(this.listQuery).then((response) => {
         this.listLoading = false
@@ -345,7 +349,9 @@ export default {
           payTypeValue: '',
           supplierName: '',
           isInvoicing: '',
-          orgPath: ''
+          orgPath: '',
+          menuUrl: '',
+          userSid: ''
         }
       }
       this.init()

yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue

@@ -89,10 +89,14 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="24">
+            <el-col :span="16">
               <div class="span-sty">备注</div>
               <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.remarks" clearable placeholder=""/></el-form-item>
             </el-col>
+            <el-col :span="8">
+              <div class="span-sty">预计到货日期</div>
+              <el-form-item><el-date-picker class="addinputInfo" v-model="formobj.deliveryDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期" /></el-form-item>
+            </el-col>
           </el-row>
           <div v-if="formobj.payTypeValue == '单笔付款'">
             <div class="title">订金及付款申请</div>
@@ -371,11 +375,11 @@ export default {
         if (res.success) {
           this.formobj.createOrgSid = res.data
           this.formobj.useOrgSid = res.data
-          choiceSupplierInfo({ orgSid: res.data }).then((resp) => {
-            if (resp.success) {
-              this.supplier_list = resp.data
-            }
-          })
+        }
+      })
+      choiceSupplierInfo({ deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) }).then((resp) => {
+        if (resp.success) {
+          this.supplier_list = resp.data
         }
       })
     },
@@ -490,7 +494,7 @@ export default {
     selectProducts() {
       this.viewState = 2
       const aa = []
-      this.$refs['divSp'].showData(aa, this.formobj.createOrgSid)
+      this.$refs['divSp'].showData(aa, this.formobj.deptSid)
     },
     backData(value) {
       this.viewState = 1
@@ -502,7 +506,7 @@ export default {
             goodSpuSid: e.goodsSpuSid,
             goodsSpuName: e.goodsSpuName,
             goodsSkuSid: e.goodsSkuSid,
-            goodsSkuTitle: '',
+            goodsSkuTitle: e.goodsSpuName,
             goodsSkuCode: e.goodsSkuCode,
             goodsSkuOwnSpec: e.indexes,
             unit: e.goodsUnitName,

yxt-as-ui/src/views/purchase/procurement/procurementInfo.vue

@@ -66,10 +66,14 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="24">
+            <el-col :span="16">
               <div class="span-sty">备注</div>
               <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
             </el-col>
+            <el-col :span="8">
+              <div class="span-sty">预计到货日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deliveryDate }}</span></el-form-item>
+            </el-col>
           </el-row>
           <div v-if="formobj.payTypeValue == '单笔付款'">
             <div class="title">订金及付款申请</div>

yxt-as-ui/src/views/purchase/procurement/relation/chooseproducts.vue

@@ -76,7 +76,7 @@ export default {
         current: 1,
         size: 5,
         params: {
-          createOrgSid: '',
+          useOrgSid: '',
           goodsSpuName: '',
           goodsSkuCode: '',
           manufacturerName: ''
@@ -129,7 +129,7 @@ export default {
     handleSelectionChange(row) {
       this.sids = row
     },
-    showData(value, createOrgSid) {
+    showData(value, useOrgSid) {
       // const aa = []
       // if (value.length > 0) {
       //   for (var i = 0; i < value.length; i++) {
@@ -139,7 +139,7 @@ export default {
       // } else {
       //   this.listQuery.params.saleVehSids = []
       // }``
-      this.listQuery.params.createOrgSid = createOrgSid
+      this.listQuery.params.useOrgSid = useOrgSid
       this.listQuery.current = 1
       this.listQuery.size = 5
       this.listQuery.total = 0

yxt-as-ui/src/views/workFlow/caigouFlow/procurementDaiBan.vue

@@ -69,10 +69,14 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="24">
+            <el-col :span="16">
               <div class="span-sty">备注</div>
               <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
             </el-col>
+            <el-col :span="8">
+              <div class="span-sty">预计到货日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deliveryDate }}</span></el-form-item>
+            </el-col>
           </el-row>
           <div v-if="formobj.payTypeValue == '单笔付款'">
             <div class="title">订金及付款申请</div>
@@ -201,6 +205,7 @@
 
 <script>
 import req from '@/api/purchase/procurement'
+import { selectStaffListss } from '@/api/Common/dictcommons'
 
 export default {
   name: 'ProcurementDaiBan',
@@ -388,6 +393,11 @@ export default {
           }
         }
       })
+      selectStaffListss().then((res) => {
+        if (res.success) {
+          this.options = res.data
+        }
+      })
     },
     // 加签
     openCountersign(val) {

yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue

@@ -88,10 +88,14 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="24">
+            <el-col :span="16">
               <div class="span-sty">备注</div>
               <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.remarks" clearable placeholder=""/></el-form-item>
             </el-col>
+            <el-col :span="8">
+              <div class="span-sty">预计到货日期</div>
+              <el-form-item><el-date-picker class="addinputInfo" v-model="formobj.deliveryDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期" /></el-form-item>
+            </el-col>
           </el-row>
           <div v-if="formobj.payTypeValue == '单笔付款'">
             <div class="title">订金及付款申请</div>
@@ -394,7 +398,7 @@ export default {
         if (res.success) {
           this.formobj = res.data
           this.formobj.instanceId = res.data.procInstId
-          choiceSupplierInfo({ orgSid: this.formobj.createOrgSid }).then((resp) => {
+          choiceSupplierInfo({ deptSid: this.formobj.deptSid }).then((resp) => {
             if (resp.success) {
               this.supplier_list = resp.data
             }
@@ -481,7 +485,7 @@ export default {
     selectProducts() {
       this.viewState = 2
       const aa = []
-      this.$refs['divSp'].showData(aa, this.formobj.createOrgSid)
+      this.$refs['divSp'].showData(aa, this.formobj.deptSid)
     },
     backData(value) {
       this.viewState = 1
@@ -493,7 +497,7 @@ export default {
             goodSpuSid: e.goodsSpuSid,
             goodsSpuName: e.goodsSpuName,
             goodsSkuSid: e.goodsSkuSid,
-            goodsSkuTitle: '',
+            goodsSkuTitle: e.goodsSpuName,
             goodsSkuCode: e.goodsSkuCode,
             goodsSkuOwnSpec: e.indexes,
             unit: e.goodsUnitName,

yxt-as-ui/src/views/workFlow/caigouFlow/procurementYiBan.vue

@@ -66,10 +66,14 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="24">
+            <el-col :span="16">
               <div class="span-sty">备注</div>
               <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
             </el-col>
+            <el-col :span="8">
+              <div class="span-sty">预计到货日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deliveryDate }}</span></el-form-item>
+            </el-col>
           </el-row>
           <div v-if="formobj.payTypeValue == '单笔付款'">
             <div class="title">订金及付款申请</div>

yxt-as-ui/src/views/workFlow/caigouFlow/relation/chooseproducts.vue

@@ -76,7 +76,7 @@ export default {
         current: 1,
         size: 5,
         params: {
-          createOrgSid: '',
+          useOrgSid: '',
           goodsSpuName: '',
           goodsSkuCode: '',
           manufacturerName: ''
@@ -129,7 +129,7 @@ export default {
     handleSelectionChange(row) {
       this.sids = row
     },
-    showData(value, createOrgSid) {
+    showData(value, useOrgSid) {
       // const aa = []
       // if (value.length > 0) {
       //   for (var i = 0; i < value.length; i++) {
@@ -139,7 +139,7 @@ export default {
       // } else {
       //   this.listQuery.params.saleVehSids = []
       // }``
-      this.listQuery.params.createOrgSid = createOrgSid
+      this.listQuery.params.useOrgSid = useOrgSid
       this.listQuery.current = 1
       this.listQuery.size = 5
       this.listQuery.total = 0