From bbe771a972f00209fc374aa2952d651d6673370c Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 14 Jul 2023 13:27:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E7=A4=BA=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  14 +-
 public/print.html                             |   5 +-
 src/api/contract.js                           |   8 ++
 .../outbounds/component/addoutbounds.vue      |  28 ++--
 src/views/outbounds/index.vue                 |  14 +-
 src/views/stocks/component/addRuku.vue        | 133 +++++++++++++++++-
 src/views/stocks/index.vue                    |   3 +-
 7 files changed, 176 insertions(+), 29 deletions(-)

diff --git a/.env.development b/.env.development
index 53f407a..5f3b6b3 100644
--- a/.env.development
+++ b/.env.development
@@ -2,15 +2,15 @@
 ENV='development'
 
 # base api
-#VUE_APP_BASE_API = http://192.168.60.99:9004/
-#VUE_APP_UPLOAD_API = http://192.168.60.99:9004/api/admin/upload-file
-#VUE_APP_OA_URL = http://192.168.60.18:2021
+VUE_APP_BASE_API = http://192.168.60.99:9004/
+VUE_APP_UPLOAD_API = http://192.168.60.99:9004/api/admin/upload-file
+VUE_APP_OA_URL = http://192.168.60.18:2021
 
 
-VUE_APP_BASE_API = http://hd-wuziguanli-test.ali251.langye.net/
-VUE_APP_UPLOAD_API = http://hd-wuziguanli-test.ali251.langye.net/api/admin/upload-file
-VUE_APP_OA_URL= http://suzhouhedaooa.langye.net
-VUE_APP_OA_URL_TYPE = '{"领用":"31","处置":"32","应急":"33"}'
+#VUE_APP_BASE_API = http://hd-wuziguanli-test.ali251.langye.net/
+#VUE_APP_UPLOAD_API = http://hd-wuziguanli-test.ali251.langye.net/api/admin/upload-file
+#VUE_APP_OA_URL= http://suzhouhedaooa.langye.net
+#VUE_APP_OA_URL_TYPE = '{"领用":"31","处置":"32","应急":"33"}'
 
 
 
diff --git a/public/print.html b/public/print.html
index 1bf11ef..729c4cc 100644
--- a/public/print.html
+++ b/public/print.html
@@ -16,8 +16,8 @@
       //canvas宽高
       var canvaswidth = 302;
       var canvasheight = 188;
-      var VUE_APP_BASE_API = window.location.protocol+"//"+window.location.host;
-      // var VUE_APP_BASE_API="http://hd-wuziguanli-test.ali251.langye.net"
+      // var VUE_APP_BASE_API = window.location.protocol+"//"+window.location.host;
+      var VUE_APP_BASE_API="http://192.168.60.99:9004"
       //文字描述位置
       var textleft = qrcodewidth / 2;
       var texttop = qrcodeheight + 70;
@@ -51,6 +51,7 @@
                   "<p style='margin:0'>编码:"+printObj['wuzibianma']+"</p>"+
                  "<p style='margin:0'>类型:"+printObj['wuzileixing']+"</p>"+
                   "<p style='margin:0'>名称:"+printObj['zichanmingcheng']+"</p>"+
+                  "<p style='margin:0'>型号:"+printObj['guigexinghao']+"</p>"+
                 "</div>"+
               "</div>"+
               "</li>")
diff --git a/src/api/contract.js b/src/api/contract.js
index c99abca..b46fc5c 100644
--- a/src/api/contract.js
+++ b/src/api/contract.js
@@ -16,6 +16,14 @@ export function show(params) {
   })
 }
 
+export function getQingShi(params) {
+  return request({
+    method: "get",
+    url: "/api/admin/other/flow-list",
+    params
+  })
+}
+
 export function getOatoken(params) {
   return request({
     method: "get",
diff --git a/src/views/outbounds/component/addoutbounds.vue b/src/views/outbounds/component/addoutbounds.vue
index 9b077b0..1286cc1 100644
--- a/src/views/outbounds/component/addoutbounds.vue
+++ b/src/views/outbounds/component/addoutbounds.vue
@@ -61,7 +61,7 @@
           </div>
         </div>
       </template>
-      <template v-slot:jieyongren>
+<!--      <template v-slot:jieyongren>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>借用人：
@@ -70,7 +70,7 @@
             <el-input v-model="form.jieyongren" placeholder="请填写借用人" clearable style="width: 300px;"></el-input>
           </div>
         </div>
-      </template>
+      </template> -->
 
       <template v-slot:jilurenyuan>
         <div class="xy-table-item">
@@ -251,6 +251,7 @@
 
 <script>
 import {save,index,show} from "@/api/system/baseForm.js"
+import {getInfo} from "@/api/user.js"
 import { Message } from 'element-ui'
 export default {
 
@@ -285,7 +286,7 @@ export default {
         chukuleixing:'',
         jieyongcangku:"",
         jieyongbumen:'',
-        jieyongren:'',
+        // jieyongren:'',
         jilurenyuan:'',
         baofeiyuanyin:'',
         beizhu:'',
@@ -300,10 +301,10 @@ export default {
         //   required: true,
         //   message: '请选择出库类型'
         // }],
-        jieyongren: [{
-          required: true,
-          message: '请填写借用人'
-        }],
+        // jieyongren: [{
+        //   required: true,
+        //   message: '请填写借用人'
+        // }],
         jilurenyuan: [{
           required: true,
           message: '请输入经办人'
@@ -412,6 +413,7 @@ export default {
   created(){
     this.getCangku()
     this.getWuzi()
+    
   },
   methods: {
     jieyong(){
@@ -536,7 +538,7 @@ export default {
         zhuangtai:res?.zhuangtai,
         jieyongcangku:res?.jieyongcangku,
         jieyongbumen:res?.jieyongbumen,
-        jieyongren:res?.jieyongren,
+        // jieyongren:res?.jieyongren,
         jilurenyuan:res?.jilurenyuan,
         baofeiyuanyin:res?.baofeiyuanyin,
         beizhu:res?.beizhu,
@@ -579,7 +581,13 @@ export default {
           this.$emit('refresh')
         })
       }
-    }
+    },
+    getUserName(){
+      getInfo().then(res=>{
+        this.form.jilurenyuan = res.name
+      })
+    },
+    
   },
   watch:{
     isShow(newVal){
@@ -588,6 +596,8 @@ export default {
         this.form.chukuleixing = this.chukuType
         if(this.type === 'editor'|| this.type==='outbounds'){
           this.getDetail()
+        }else{
+          this.getUserName()
         }
       }else{
         this.id = ''
diff --git a/src/views/outbounds/index.vue b/src/views/outbounds/index.vue
index 29afbd7..82d6d91 100644
--- a/src/views/outbounds/index.vue
+++ b/src/views/outbounds/index.vue
@@ -131,14 +131,14 @@
             prop: 'jieyongbumen',
             align: 'center',
           },
+          // {
+          //   label: "借用人",
+          //   width: 180,
+          //   prop: 'jieyongren',
+          //   align: 'center',
+          // },
           {
-            label: "借用人",
-            width: 180,
-            prop: 'jieyongren',
-            align: 'center',
-          },
-          {
-            label: "记录人员",
+            label: "经办人",
             width: 180,
             prop: 'jilurenyuan',
             align:'center'
diff --git a/src/views/stocks/component/addRuku.vue b/src/views/stocks/component/addRuku.vue
index 9d67dac..47d53b1 100644
--- a/src/views/stocks/component/addRuku.vue
+++ b/src/views/stocks/component/addRuku.vue
@@ -14,6 +14,17 @@
               style="width: 300px;"></el-input>
           </div>
         </div>
+      </template>
+      <template v-slot:caigouhetong v-if="form.rukuleixing=='请示'">
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>请示流程：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input type="text" @focus="isShowQs=true" v-model="form.qingshiliucheng" placeholder="请选择请示流程"
+              style="width: 300px;"></el-input>
+          </div>
+        </div>
       </template>
       <template v-slot:gudingzichanbianhao>
         <div class="xy-table-item">
@@ -251,7 +262,18 @@
       <Table highlight-row ref="currentRowTable" :columns="htColumns" :data="htList" @on-current-change="htSelect" />
       <Page :current="htPageIndex" :total="htTotal" simple
         style="padding-top: 14px;display: flex;justify-content: center;" @on-change="htPageChange" />
-    </Modal>
+    </Modal>
+    <!-- 选择请示流程 -->
+    <Modal v-model="isShowQs" title="请示选择" width='70%' @on-cancel='qsCancel' @on-ok='qsComfirm'>
+      <div class="searchCompanys">
+        <el-input type="text" @keyup.enter.native="getQs" v-model="qskeyword" placeholder="请输入关键词查找"></el-input>
+        <el-button type="primary" @click="getQs">查询</el-button>
+      </div>
+      <Table highlight-row ref="currentRowTable" :columns="qsColumns" :data="qsList" @on-current-change="qsSelect" />
+      <Page :current="qsPageIndex" :total="qsTotal" simple
+      style="padding-top: 14px;display: flex;justify-content: center;" @on-change="qsPageChange" />
+    </Modal>
+
     <detailContract ref='detailContract'></detailContract>
     <imports :table-name="importstableName" :istrueimport='false' :form-info="importForm" ref="imports"
       @importdata='getimportData'></imports>
@@ -266,7 +288,9 @@
     show
   } from "@/api/system/baseForm.js"
   import {
-    index as getContract
+    index as getContract,
+    getQingShi,
+    getOatoken
   } from "@/api/contract.js"
   import {
     Message
@@ -483,7 +507,58 @@
               }
             }, '查看详情')
           }
-        }]
+        }],
+        //请示流程
+        isShowQs:false,
+        qsList: [],
+        qskeyword: '',
+        qsPageIndex: 1,
+        qsTotal: 0,
+        editQs: '',
+        qsColumns: [{
+          width: 60,
+          _isChecked: false,
+          key: "isSelect",
+          resizable: true,
+          render: (h, params) => {
+            return h('div', [
+              h('Radio', {
+                props: {
+                  value: params.row.isSelect
+                },
+                on: {
+                  'on-change': (e) => {
+                    this.qsList.forEach((items) => {
+                      this.$set(items, 'isSelect', false)
+                    });
+                    this.qsList[params.index].isSelect = e;
+                  }
+                }
+              })
+            ])
+          }
+        }, {
+          title: '名称',
+          key: 'title',
+        }, {
+          title: '查看',
+          key: '',
+          width: 100,
+          render: (h, params) => {
+            return h('span', {
+              style: {
+                color: '#0077CC',
+                cursor: 'pointer'
+              },
+              on: {
+                'click': (e) => {
+                  this.toQsFollow(params.row.belongs_id)
+                  // @click=","
+                }
+              }
+            }, '查看详情')
+          }
+        }],
       }
     },
     created() {
@@ -547,6 +622,55 @@
         console.log("e", e)
         this.htPageIndex = e
         this.getHt()
+      },
+      // 获取请示流程
+      async getQs() {
+        let res = await getQingShi({
+          table:'qingshi',
+          page:this.qsPageIndex
+          // page_size: 10,
+          // page: this.htPageIndex,
+          // keyword: this.htkeyword,
+        })
+        for (var m of res.data.flow.data) {
+          m.isSelect = false
+        }
+        this.qsList = res.data.flow.data
+        this.qsTotal = res.data.flow.total
+        // this.hetongoptions = res.data
+      },
+      qsCancel() {
+        this.qsList.forEach((items) => {
+          this.$set(items, 'isSelect', false)
+        });
+        this.form.qingshiliucheng = this.editQs
+      },
+      qsSelect(e) {
+        this.qsList.forEach((items) => {
+          this.$set(items, 'isSelect', false)
+          if (items.id == e.id) {
+            this.$set(items, 'isSelect', true)
+          }
+        });
+
+      },
+      qsComfirm() {
+        this.qsList.forEach((items) => {
+          if (items.isSelect == true) {
+            this.form.qingshiliucheng = items.title
+            this.editQs = items.title
+          }
+        });
+      },
+      qsPageChange(e) {
+        this.qsPageIndex = e
+        this.getQs()
+      },
+      async toQsFollow(id){
+        let res = await getOatoken()
+        let url =
+          `${process.env.VUE_APP_OA_URL}/admin/flow/view/${id}?oatoken=${res.oatoken}`
+        let seeBuy = window.open(url, 'seeBuy','location=0')
       },
       // 物资明细 回库从库存中选 其他从物资档案
       mingxiConfirm() {
@@ -848,6 +972,9 @@
           this.rukuTypeName = this.rukuType == '回库' ? '归还' : this.rukuType
           if (this.rukuType == '采购') {
             this.getHt()
+          }
+          if (this.rukuType == '请示') {
+            this.getQs()
           }
           if (this.type === 'editor') {
             this.getDetail()
diff --git a/src/views/stocks/index.vue b/src/views/stocks/index.vue
index 2065d35..faee9dc 100644
--- a/src/views/stocks/index.vue
+++ b/src/views/stocks/index.vue
@@ -76,7 +76,8 @@
           return:'回库',
           check:'盘点',
           data:"数据校对",
-          mock:'模拟盘点'
+          mock:'模拟盘点',
+          ask:'请示'
         },
         customForm: {
           customFormId: "",