申请管理
-
+
+ -->
+ 详情查看
+
+ 审批
+
+
+
-
-
+
+
-
-
+
+
-
+
-
+
@@ -107,10 +110,7 @@
@@ -128,7 +128,8 @@ import {
} from '@/api/reagent/drugStock'
import {
- get_apply_list
+ get_apply_list,
+ update_solve
} from '@/api/reagent/applymanage'
import stringify from '@/utils/stringify'
export default {
@@ -176,6 +177,23 @@ export default {
this.total = rsp.data.total_count
})
},
+ handleClick(row){
+ var that =this
+ const data={
+ id:row.id
+ }
+ update_solve(stringify(data)).then(rsp => {
+ console.log(rsp)
+ if (rsp.status === 0) {
+ this.$message.success("审批成功！")
+ this.handleRefresh()
+ // this.get_stock_list()
+ } else {
+ this.$message.error(rsp.msg)
+ }
+ })
+
+ },
pageChange(page) {
this.page = page
this.get_stock_list()
@@ -184,7 +202,12 @@ export default {
this.handleSelectionSelection = val
},
// handleHistory() {
- // this.dialogHistoryVisible = true
+ // console.log(this.handleSelectionSelection,'1111')
+ // if(this.handleSelectionSelection.length ===1){
+ // this.dialogHistoryVisible = true
+ // }else{
+ // alert('请勾选单条申请！')
+ // }
// },
handleRefresh() {
this.get_apply()
@@ -232,16 +255,8 @@ export default {
handleCheck() {
if (this.handleSelectionSelection.length === 1) {
this.dialogHistoryVisible = true
- const data = {
- id:this.handleSelectionSelection[0].id
- }
- get_stock_info(stringify(data)).then(rsp => {
- if (rsp.status === 0) {
- this.historyData = rsp.data
- } else {
- this.$message.error(rsp.msg)
- }
- })
+ this.historyData = JSON.parse(this.handleSelectionSelection[0].use_content)
+ console.log(this.handleSelectionSelection[0].use_content,'111')
} else {
this.$message.warning("选择一条记录操作！")
}
diff --git a/src/views/reagent/createapply/index copy.vue b/src/views/reagent/createapply/index copy.vue
new file mode 100644
index 0000000..b9209f6
--- /dev/null
+++ b/src/views/reagent/createapply/index copy.vue
@@ -0,0 +1,288 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/reagent/createapply/index.vue b/src/views/reagent/createapply/index.vue
index 6d5d029..275ee52 100644
--- a/src/views/reagent/createapply/index.vue
+++ b/src/views/reagent/createapply/index.vue
@@ -2,40 +2,65 @@
创建申请
+
+ 申请
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 提交申请
+
+
+
+
+
+
+ 创建申请
-
-
申请
-
-
-
-
-
-
-
-
+
+
+
+ 添加申请
+
+
+
+
+
+
+
+ 取消申请
+
+
+
取消
提交申请
@@ -49,32 +74,31 @@
-
-
- {{''}}
-
-
+
开始打印
+
+
+
@@ -307,7 +326,8 @@ import {
add_tmp,
del_tmp,
u_file_list,
- put_in_tmp, pring_bar_code
+ put_in_tmp, pring_bar_code,
+ enter_db_client_list
} from '@/api/reagent/warehousing'
import stringify from '@/utils/stringify'
import { throttle } from '@/utils'
@@ -318,6 +338,10 @@ export default {
data() {
return {
// 打印模板
+ chosedata:[],
+ radio1:'',
+ radio2:'',
+ detailVisible:false,
dialogVisible: false,
formData: {
start_code: undefined,
@@ -390,6 +414,40 @@ export default {
this.getTmpList()
},
methods: {
+ putindata(){
+ if(this.radio1 !='' && this.radio2 !=''){
+ const data = JSON.parse(JSON.stringify(this.currentRow))
+ data.flow_position_code =this.radio2
+ data.client_id=this.radio1
+ const id = data.index
+ delete data.status
+ delete data.index
+ bind_tmp_enter_warehouse(stringify({
+ 'tmplate_content': JSON.stringify(data),
+ 'bar_code': this.barCode,
+ // 'client_id': this.client_id_input,
+ })).then(res => {
+ if (res.status === 0) {
+ this.$set(this.bindToDBData, id, { ...this.bindToDBData[id], status: true })
+ this.$message.success('入库成功！')
+ this.detailVisible=false
+ // 判断是否是最后一行，不是最后一行自动选择下一行
+ if (id < this.bindToDBData.length - 1) {
+ // 将下一行自动选中
+ this.$refs.singleTable.setCurrentRow(this.bindToDBData[id + 1])
+ }
+ } else {
+ this.$message.error('入库失败，请重试！')
+ }
+ })
+ }else{
+ this.$message.warning('请选择位置')
+ }
+ },
+ changeHandler(value){
+ var that =this
+ that.radio2=''
+ },
// 执行打印条码
doPrintCode() {
this.$refs['elForm'].validate(valid => {
@@ -431,33 +489,24 @@ export default {
},
// getCode
getCode(code) {
+ var that =this
this.barCode = code
if (this.barCode) {
if (!this.client_id_input) {
this.$message.warning('请选择存储柜体！')
return
}
- const data = JSON.parse(JSON.stringify(this.currentRow))
- const id = data.index
- delete data.status
- delete data.index
- bind_tmp_enter_warehouse(stringify({
- 'tmplate_content': JSON.stringify(data),
- 'bar_code': this.barCode,
- 'client_id': this.client_id_input
- })).then(res => {
- if (res.status === 0) {
- this.$set(this.bindToDBData, id, { ...this.bindToDBData[id], status: true })
- this.$message.success('入库成功！')
- // 判断是否是最后一行，不是最后一行自动选择下一行
- if (id < this.bindToDBData.length - 1) {
- // 将下一行自动选中
- this.$refs.singleTable.setCurrentRow(this.bindToDBData[id + 1])
- }
- } else {
- this.$message.error('入库失败，请重试！')
- }
+ const row = JSON.parse(JSON.stringify(this.currentRow))
+ const data = {
+ drug_name: row.name
+ }
+ enter_db_client_list(stringify(data)).then(res => {
+ console.log(res.data)
+ that.chosedata=res.data
+ that.radio1=res.data[0].client_id
+ that.radio2=res.data[0].client_cell[0]
})
+ this.detailVisible =true
}
},
// 选择模板
diff --git a/src/views/reagent/weightregistration/index.vue b/src/views/reagent/weightregistration/index.vue
new file mode 100644
index 0000000..260f522
--- /dev/null
+++ b/src/views/reagent/weightregistration/index.vue
@@ -0,0 +1,383 @@
+
+
+
+
+
+
+
+
+
+
+
+
-
+ 搜索
+
-
+
+ {{item.client_name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/shortcut/index.vue b/src/views/shortcut/index.vue
index 836e42d..ebad1f7 100644
--- a/src/views/shortcut/index.vue
+++ b/src/views/shortcut/index.vue
@@ -80,7 +80,7 @@ export default {
},
{
id: 1,
- title: '标准品管理',
+ title: '危化品管理',
items: [
{ name: '试剂入库', id: 0 },
{ name: '试剂领用', id: 1 },
diff --git a/src/views/user/index.vue b/src/views/user/index.vue
index 4596386..913213b 100644
--- a/src/views/user/index.vue
+++ b/src/views/user/index.vue
@@ -148,7 +148,7 @@
v-loading="tabsLoading"
element-loading-text="拼命加载中"
>
-
+
+ {{ subTitle }}
+
+
+
+
+
+
+
+
+
+
+ 选择称重
+ 精度：0.01g±0.03g
+
+
+
+ {{ showWeigh }}
+ 克(g)
+
+
+ 余量称重
+
+ 称重登记
+ 去皮（初始化天平）
+
+
+
+ {{
+ infoData.name
+ }}
+
+ {{ infoData.english_name }}
+ {{ infoData.bar_code }}
+ {{ infoData.cas_number }}
+ {{ infoData.purity }}
+ {{ infoData.remain }}
+ {{ infoData.production_date }}
+ {{ infoData.expiration_date }}
+ {{ infoData.manufacturer }}
+ {{ infoData.distributor }}
+
+
+ {{ statusMap[scope.row.status - 1] }}
+
+
+ {{ infoData.is_supervise }}
+
+
+
+ {{ infoData.by_user_name }}
+
+
+
+ 详情信息
+
+ {{ $store.getters.currentOptions.find(item => item.client_id === infoData.client_id).client_name }}
+
+
+ {{ infoData.client_id }}
+
+