工种，单位换算

src/api/product.js

@@ -60,19 +60,10 @@ export function getWorkTypeDetail (id) {
   })
 }
 
-// 新增工种
-export function addWorkType (data) {
+// 新增或修改工种
+export function addOrUpdateWorkType (data, isAdd) {
   return request({
-    url: request.adornUrl(`/biz-service/workType/save`),
-    method: 'post',
-    data
-  })
-}
-
-// 更新工种
-export function updateWorkType (data) {
-  return request({
-    url: request.adornUrl(`/biz-service/workType/update`),
+    url: request.adornUrl(isAdd ? `/biz-service/workType/save` : `/biz-service/workType/update`),
     method: 'post',
     data
   })

src/api/warehouse.js

@@ -41,6 +41,23 @@ export function getConversionList (params) {
   })
 }
 
+// 获取换算详情
+export function getConversionDetail (id) {
+  return request({
+    url: request.adornUrl(`/biz-service/conversion-ctl/info/${id}`),
+    method: 'get'
+  })
+}
+
+// 新增或修改换算
+export function addOrUpdateConversion (data, isAdd) {
+  return request({
+    url: request.adornUrl(isAdd ? `/biz-service/conversion-ctl/save` : `/biz-service/conversion-ctl/update`),
+    method: isAdd ? 'post' : 'put',
+    data
+  })
+}
+
 // 入库申请
 export function inboundBatch (data) {
   return request({

src/views/modules/tech/work-type-add-or-update.vue

@@ -66,7 +66,7 @@
 <script>
   import UserComponents from '../common/user-components'
   import { getDictList } from '@/api/dict'
-  import { addWorkType, updateWorkType, getWorkTypeDetail } from '@/api/product'
+  import { addOrUpdateWorkType, getWorkTypeDetail } from '@/api/product'
   export default {
     name: 'work-type-add-or-update',
     components: {UserComponents},
@@ -129,7 +129,7 @@
               requirement: this.dataForm.requirement,
               typeId: this.id ? this.id : null
             }
-            this.id ? updateWorkType(params) : addWorkType(params).then(({data}) => {
+            addOrUpdateWorkType(params, !this.id).then(({data}) => {
               if (data && data.code === '200') {
                 this.$message({
                   message: '操作成功',

src/views/modules/warehouse/unit-add.vue

@@ -1,104 +1,101 @@
 <template>
   <el-dialog
-    title="新增换算"
+    :title="!id ? '新增': display ? '详情' : '修改'"
+    width="70%"
     :close-on-click-modal="false"
     :visible.sync="visible">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="auto">
       <el-row class="my-row">
-        <el-form-item label="编码">
-          <el-input v-model="dataForm.code"  placeholder="编码"></el-input>
+        <el-form-item label="编码" prop="conversionCode">
+          <el-input v-model="dataForm.conversionCode" :disabled="true" placeholder="系统自动生成"></el-input>
         </el-form-item>
       </el-row>
       <el-row class="my-row">
         <el-col :span="12">
-          <el-form-item label="数量">
-            <el-input v-model="dataForm.code"  placeholder="数量"></el-input>
+          <el-form-item label="转换前数量">
+            <el-input value="1" :disabled="true" placeholder="数量"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12" style="padding-left: 20px">
-          <el-form-item label="单位">
-            <el-input v-model="dataForm.code"  placeholder="单位"></el-input>
+          <el-form-item label="单位" prop="convertUnitBefore">
+            <el-input v-model="dataForm.convertUnitBefore" :disabled="display" placeholder="单位"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row class="my-row">
         <el-col :span="12">
-          <el-form-item label="转换后数量">
-            <el-input v-model="dataForm.code"  placeholder="转换后数量"></el-input>
+          <el-form-item label="转换后数量" prop="cnt">
+            <el-input-number v-model="dataForm.cnt" :disabled="display" placeholder="转换后数量" :min="1" :step="1"></el-input-number>
           </el-form-item>
         </el-col>
         <el-col :span="12" style="padding-left: 20px">
-          <el-form-item label="单位">
-            <el-input v-model="dataForm.code"  placeholder="转换后单位"></el-input>
+          <el-form-item label="单位" prop="convertUnit">
+            <el-input v-model="dataForm.convertUnit" :disabled="display" placeholder="转换后单位"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row class="my-row">
-        <el-form-item label="备注说明：">
-          <el-input v-model="dataForm.code"  placeholder="编码"></el-input>
+        <el-form-item label="备注说明" prop="notes">
+          <el-input v-model="dataForm.notes" :disabled="display" placeholder="编码"></el-input>
         </el-form-item>
       </el-row>
     </el-form>
     <span slot="footer" class="dialog-footer">
-      <el-button @click="visible = false">取消</el-button>
-      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+      <el-button v-if="!display" @click="visible = false">取消</el-button>
+      <el-button v-if="!display" type="primary" @click="dataFormSubmit()">确定</el-button>
     </span>
   </el-dialog>
 </template>
 
 <script>
-  import UserComponent from '../common/user-component'
-  import DictSelect from '../sys/dict-select'
-  import {getUUID} from '../../../utils'
+  import { getConversionDetail, addOrUpdateConversion } from '../../../api/warehouse'
   export default {
-    name: 'stock-order-inbound',
-    components: {DictSelect, UserComponent},
+    name: 'unit-add',
     data () {
       return {
         visible: false,
-        dictType: 'material_type',
-        dataList: [],
+        display: false,
+        id: 0,
         dataForm: {
-          id: '',
-          amount: 0,
-          applicant: ''
+          cnt: 1
         },
         dataRule: {
+          convertUnitBefore: [{ required: true, message: '转换前单位不能为空', trigger: 'blur' }],
+          cnt: [{ required: true, message: '转换后数量不能为空', trigger: 'blur' }],
+          convertUnit: [{ required: true, message: '转换后单位不能为空', trigger: 'blur' }]
         }
       }
     },
     methods: {
-      init () {
+      async init (id, display) {
+        this.dataForm = {}
         this.visible = true
-        this.dataForm.code = getUUID()
+        this.id = id || 0
+        this.display = display
+        if (!id) return
+        await getConversionDetail(this.id).then(({data}) => {
+          if (data && data.code === '200') {
+            this.dataForm = data.data
+          }
+        })
+      },
+      validateField (type) {
+        this.$refs.dataForm.validateField(type)
       },
       // 表单提交
       dataFormSubmit () {
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
-            this.$http({
-              url: this.$http.adornUrl(`/biz-service/in-out-bound-ctl/inbound`),
-              method: 'post',
-              data: this.$http.adornData({
-                'amount': this.dataForm.amount,
-                'applicant': this.dataForm.applicant,
-                'approver': this.dataForm.approver,
-                'batchNumber': this.dataForm.batchNumber,
-                'cnt': this.dataForm.cnt,
-                'materialId': this.dataForm.materialId,
-                'materialName': this.dataForm.materialName,
-                'notes': this.dataForm.notes,
-                'price': this.dataForm.price,
-                'orgId': this.dataForm.orgId,
-                'recordType': this.dataForm.recordType,
-                'source': this.dataForm.source,
-                'state': this.dataForm.state,
-                'templateItemPlanId': this.dataForm.templateItemPlanId,
-                'usage': this.dataForm.usage,
-                'userId': this.dataForm.userId,
-                'creatorId': this.$store.state.user.id
-              })
-            }).then(({data}) => {
+            let params = {
+              cnt: this.dataForm.cnt,
+              conversionCode: this.dataForm.conversionCode,
+              conversionId: this.id ? this.id : null,
+              convertUnit: this.dataForm.convertUnit,
+              convertUnitBefore: this.dataForm.convertUnitBefore,
+              orgId: this.orgId,
+              notes: this.dataForm.notes
+            }
+            addOrUpdateConversion(params, !this.id).then(({data}) => {
               if (data && data.code === '200') {
                 this.$message({
                   message: '操作成功',
@@ -112,23 +109,7 @@
               } else {
                 this.$message.error(data.msg)
               }
-            })
-          }
-        })
-      },
-      validateField (type) {
-        this.$refs.dataForm.validateField(type)
-      },
-      userChanged (userId) {
-        this.$http({
-          url: this.$http.adornUrl('/user-service/user/info/' + userId),
-          method: 'get'
-        }).then(({data}) => {
-          if (data && data.code === '200') {
-            this.dataForm.orgId = data.data.orgId
-            this.dataForm.orgName = data.data.orgName
-          } else {
-            this.$message.error(data.msg)
+            }).catch(() => {})
           }
         })
       }

src/views/modules/warehouse/unit-conversion.vue

@@ -2,18 +2,8 @@
 <template>
   <div class="stock-order">
     <el-form :inline="true" :model="dataForm" @keyup.enter.native="queryData()">
-      <el-form-item label="创建人">
-        <el-input v-model="dataForm.name" placeholder="创建人" clearable></el-input>
-      </el-form-item>
-      <el-form-item label="创建时间">
-        <el-date-picker
-          v-model="dataForm.date"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          type="datetimerange"
-          range-separator="至"
-          start-placeholder="开始时间"
-          end-placeholder="结束时间">
-        </el-date-picker>
+      <el-form-item label="换算后单位">
+        <el-input v-model="dataForm.convertUnit" placeholder="换算后单位" clearable></el-input>
       </el-form-item>
       <el-form-item>
         <el-button @click="queryData()">查询</el-button>
@@ -33,57 +23,55 @@
         align="center">
       </el-table-column>
       <el-table-column
-        prop="-"
+        prop="conversionCode"
         header-align="center"
         align="center"
+        min-width="160"
         label="编码">
       </el-table-column>
       <el-table-column
-        prop="recordType"
+        prop="convertUnitBefore"
         header-align="center"
         align="center"
-        label="数量">
+        label="转换前单位">
       </el-table-column>
       <el-table-column
-        prop="state"
+        prop="convertUnit"
         header-align="center"
         align="center"
-        label="单位">
+        label="转换后单位">
       </el-table-column>
       <el-table-column
-        prop="approver"
+        prop="cnt"
         header-align="center"
         align="center"
-        label="转换数量">
+        label="转换后数量">
       </el-table-column>
       <el-table-column
-        prop="-"
-        header-align="center"
-        align="center"
-        label="转换单位">
-      </el-table-column>
-      <el-table-column
-        prop="-"
+        prop="useNumber"
         header-align="center"
         align="center"
         label="使用次数">
       </el-table-column>
       <el-table-column
-        prop="-"
+        prop="creatorName"
         header-align="center"
         align="center"
         label="创建人">
       </el-table-column>
       <el-table-column
-        prop="-"
+        prop="createTime"
         header-align="center"
         align="center"
+        min-width="160"
         label="创建时间">
       </el-table-column>
       <el-table-column
-        prop="-"
+        prop="notes"
         header-align="center"
         align="center"
+        width="100"
+        :show-overflow-tooltip="true"
         label="备注">
       </el-table-column>
       <el-table-column
@@ -93,7 +81,8 @@
         width="100"
         label="操作">
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="details(scope.row.id)">查看</el-button>
+          <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.conversionId, true)">查看</el-button>
+          <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.conversionId, false)">编辑</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -143,9 +132,13 @@
         pageSize: 10,
         totalPage: 0,
         dataListLoading: false,
-        dataListSelections: []
+        dataListSelections: [],
+        addOrUpdateVisible: false
       }
     },
+    created () {
+      this.queryData()
+    },
     methods: {
       // 查询
       queryData () {
@@ -158,9 +151,7 @@
         let params = {
           'current': this.pageIndex,
           'size': this.pageSize,
-          'userId': this.$store.state.user.id,
-          'beginTime': this.dataForm.date[0],
-          'endTime': this.dataForm.date[1]
+          'convertUnit': this.dataForm.convertUnit
         }
         getUnitConversionList(params).then(({data}) => {
           if (data && data.code === '200') {
@@ -189,10 +180,10 @@
         this.dataListSelections = val
       },
       // 入库申请
-      addOrUpdateHandle () {
+      addOrUpdateHandle (id, display) {
         this.addOrUpdateVisible = true
         this.$nextTick(() => {
-          this.$refs.addOrUpdate.init()
+          this.$refs.addOrUpdate.init(id, display)
         })
       }
     }