Merge remote-tracking branch 'origin/xq'

jshERP-web/src/components/jeecg/JEditableTable.vue

@@ -3306,6 +3306,7 @@ export default {
         overflow: hidden;
         white-space: nowrap;
         text-overflow: ellipsis;
+        max-width: 150px;
       }
     }
   }

jshERP-web/src/components/jeecg/JUpload.vue

@@ -231,7 +231,9 @@ export default {
       let fileList = []
       let arr = paths.split(',')
       for (var a = 0; a < arr.length; a++) {
-        let url = getFileAccessHttpUrl('systemConfig/static/' + arr[a])
+        // let url = getFileAccessHttpUrl('systemConfig/static/' + arr[a])
+        let url = getFileAccessHttpUrl(arr[a])
+
         fileList.push({
           uid: uidGenerator(),
           name: getFileName(arr[a]),

jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue

@@ -93,14 +93,14 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
-                <a-col :md="6" :sm="24">
+                <!-- <a-col :md="6" :sm="24">
                   <a-form-item label="批号" :labelCol="{ span: 5 }" :wrapperCol="{ span: 18, offset: 1 }">
                     <a-select placeholder="有无批号" v-model="queryParam.enableBatchNumber">
                       <a-select-option value="1">有</a-select-option>
                       <a-select-option value="0">无</a-select-option>
                     </a-select>
                   </a-form-item>
-                </a-col>
+                </a-col> -->
               </template>
             </a-row>
           </a-form>

jshERP-web/src/mixins/newTableMixin.js

@@ -5,8 +5,8 @@ export const newTableMixin = {
     return {
       ipagination: {
         current: 1,
-        pageSize: 2,
-        pageSizeOptions: ['2', '20', '30', '50', '100'],
+        pageSize: 10,
+        pageSizeOptions: ['10', '20', '30', '50', '100'],
         showTotal: (total, range) => {
           return range[0] + '-' + range[1] + ' 共' + total + '条'
         },

jshERP-web/src/views/bill/PurchaseOrderList.vue

@@ -189,6 +189,7 @@
               <a-tag v-if="status == '1'" color="green">已审核</a-tag>
               <a-tag v-if="status == '2'" color="cyan">完成采购</a-tag>
               <a-tag v-if="status == '3'" color="blue">部分采购</a-tag>
+              <a-tag v-if="status == '4'" color="purple">进行中</a-tag>
               <a-tag v-if="status == '9'" color="orange">审核中</a-tag>
             </template>
           </a-table>

jshERP-web/src/views/bill/dialog/BillDetail.vue

@@ -558,6 +558,11 @@
                 {{ model.debt }}
               </a-form-item>
             </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="二维码">
+                <vue-qr :text="model.number" :size="200" />
+              </a-form-item>
+            </a-col>
             <a-col v-if="model.hasBackFlag" :span="6">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="退货单号">
                 <template v-for="(item, index) in linkNumberList">

jshERP-web/src/views/bill/mixins/BillModalMixin.js

@@ -484,6 +484,7 @@ export const BillModalMixin = {
           getMaterialByBatchNumber(param).then((res) => {
             if (res && res.code === 200) {
               let mList = res.data
+
               if (value.indexOf(',') > -1) {
                 //多个条码
                 this.$refs.materialDataTable.getValues((error, values) => {
@@ -541,6 +542,7 @@ export const BillModalMixin = {
                       values: mInfoEx,
                     }
                     mArr.push(mObj)
+
                     target.setValues(mArr)
                     target.recalcAllStatisticsColumns()
                     that.autoChangePrice(target)
@@ -698,7 +700,7 @@ export const BillModalMixin = {
             }
             for (let i of arr) {
               if (i.name === value) {
-                target.setValues([{ rowKey: row.id, values: { actualQuantityInStorage: i.ratio, unitName: i.name } }])
+                target.setValues([{ rowKey: row.id, values: { unitName: i.name } }])
               }
             }
           }
@@ -709,7 +711,7 @@ export const BillModalMixin = {
     //转为商品对象
     parseInfoToObj(mInfo) {
       return {
-        barCode: mInfo.mBarCode,
+        barCode: mInfo.barCode,
         batchNumber: mInfo.batchNumber,
         name: mInfo.name,
         standard: mInfo.standard,

jshERP-web/src/views/bill/modules/PurchaseInModal.vue

@@ -294,8 +294,9 @@
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :sm="24">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次付款">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次实际付款">
               <a-input
+                disabled
                 placeholder="请输入本次付款"
                 v-decorator.trim="['changeAmount', validatorRules.changeAmount]"
                 @change="onChangeChangeAmount"

jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue

@@ -319,6 +319,20 @@
             </a-form-item>
           </a-col>
         </a-row>
+        <a-row class="form-row" :gutter="24">
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              label="凭证图片"
+              data-step="11"
+              data-title="附件"
+              data-intro="可以上传与单据相关的图片、文档，支持多个文件"
+            >
+              <j-image-upload v-model="imageList" bizPath="material" text="上传图片" isMultiple></j-image-upload>
+            </a-form-item>
+          </a-col>
+        </a-row>
       </a-form>
     </a-spin>
     <many-account-modal ref="manyAccountModalForm" @ok="manyAccountModalFormOk"></many-account-modal>
@@ -347,6 +361,7 @@ import { BillModalMixin } from '../mixins/BillModalMixin'
 import { findBillDetailByNumber, getCurrentSystemConfig } from '@/api/api'
 import { getMpListShort, changeListFmtMinus, handleIntroJs } from '@/utils/util'
 import JUpload from '@/components/jeecg/JUpload'
+import JImageUpload from '@/components/jeecg/JImageUpload.vue'
 import JDate from '@/components/jeecg/JDate'
 import Vue from 'vue'
 // import QrcodeVue from 'qrcode.vue'
@@ -363,6 +378,7 @@ export default {
     WorkflowIframe,
     BillPrintIframe,
     JUpload,
+    JImageUpload,
     JDate,
     // QrcodeVue,
     VNodes: {
@@ -383,6 +399,7 @@ export default {
       operTimeStr: '',
       prefixNo: 'CGDD',
       fileList: [],
+      imageList: [],
       rowCanEdit: true,
       //以销定购的场景开关
       purchaseBySaleFlag: false,
@@ -420,7 +437,7 @@ export default {
           { title: '商品条码', key: 'barCode', width: '6%', type: FormTypes.normal },
           { title: '仓库名', key: 'depotName', width: '6%', type: FormTypes.normal },
           { title: '仓库货架', key: 'position', width: '6%', type: FormTypes.normal },
-          { title: '包装规格', key: 'unitName', width: '6%', type: FormTypes.input },
+          { title: '包装规格', key: 'unitName', width: '6%', type: FormTypes.normal },
 
           { title: '型号', key: 'model', width: '9%', type: FormTypes.normal },
           { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
@@ -517,6 +534,7 @@ export default {
       if (this.action === 'add') {
         this.addInit(this.prefixNo)
         this.fileList = []
+        this.imageList = []
         this.$nextTick(() => {
           handleIntroJs(this.prefixNo, 1)
         })
@@ -535,6 +553,8 @@ export default {
           this.manyAccountBtnStatus = false
         }
         this.fileList = this.model.fileName
+        this.imageList = this.model.voucherPicture
+
         this.$nextTick(() => {
           this.form.setFieldsValue(
             pick(
@@ -598,6 +618,11 @@ export default {
       } else {
         billMain.fileName = ''
       }
+      if (this.imageList && this.imageList.length > 0) {
+        billMain.voucherPicture = this.imageList
+      } else {
+        billMain.voucherPicture = ''
+      }
       if (this.model.id) {
         billMain.id = this.model.id
       }

jshERP-web/src/views/bill/modules/SaleOrderModal.vue

@@ -382,10 +382,10 @@ export default {
             multi: true,
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
-          { title: '名称', key: 'name', width: '10%', type: FormTypes.normal },
+          { title: '名称', key: 'name', width: '9%', type: FormTypes.normal },
           { title: '规格', key: 'standard', width: '9%', type: FormTypes.normal },
 
-          { title: '生产日期', key: 'productionDate', width: '9%', type: FormTypes.normal },
+          { title: '生产日期', key: 'productionDate', width: '6%', type: FormTypes.normal },
           { title: '保质期', key: 'expiryNum', width: '6%', type: FormTypes.normal },
           { title: '商品条码', key: 'barCode', width: '6%', type: FormTypes.normal },
           { title: '仓库名', key: 'depotName', width: '6%', type: FormTypes.normal },

jshERP-web/src/views/bill/modules/SaleOutModal.vue

@@ -474,7 +474,7 @@ export default {
           { title: '生产日期', key: 'productionDate', width: '9%', type: FormTypes.normal },
           { title: '保质期', key: 'expiryNum', width: '6%', type: FormTypes.normal },
           { title: '商品条码', key: 'barCode', width: '6%', type: FormTypes.normal },
-          { title: '仓库名', key: 'depotName', width: '6%', type: FormTypes.normal },
+          { title: '仓库名', key: 'depotId', width: '6%', type: FormTypes.select, disabled: true },
           { title: '仓库货架', key: 'position', width: '6%', type: FormTypes.normal },
           { title: '包装规格', key: 'unitName', width: '6%', type: FormTypes.normal },
 

jshERP-web/src/views/stock/components/checkModal.vue

@@ -250,7 +250,12 @@ export default {
   },
   computed: {
     isShowBtn() {
-      return this.openType !== 'detail' && this.form.taskStatus !== 1
+      console.log('==================', this.form.taskStatus)
+
+      if (this.openType === 'detail') return false
+      if (this.form.taskStatus !== 1) return false
+
+      return true
     },
   },
   methods: {
@@ -354,6 +359,7 @@ export default {
     },
     getList(id) {
       const url2 = '/stocktaking/detailByItemList'
+      const form = this.$refs['editForm'].form
 
       const params = { ...this.queryParams, taskStocktakingId: id }
       const url = url2 + '?pageNum=' + this.ipagination.current + '&pageSize=' + this.ipagination.pageSize

jshERP-web/src/views/stock/components/stockModal.vue

@@ -27,9 +27,9 @@
             rowKey="id"
             :columns="columns"
             :dataSource="dataSource"
-            :components="handleDrag(columns)"
-            :pagination="ipagination"
             :loading="loading"
+            :scroll="{ y: 500 }"
+            :pagination="false"
             @change="handleTableChange"
           >
             <span v-if="form.taskType === 2" slot="action" slot-scope="text, record">
@@ -129,7 +129,7 @@ export default {
       if (val) {
         if (this.taskId) {
           this.$nextTick(() => {
-            this.getDetailList(this.taskId)
+            this.getList(this.taskId)
           })
 
           return
@@ -143,7 +143,11 @@ export default {
   },
   computed: {
     isShowBtn() {
-      return this.openType !== 'detail' && this.form.taskStatus !== 1
+      if (this.openType === 'add') return true
+
+      if (this.openType === 'detail') return false
+      if (this.form.taskStatus !== 1) return false
+      return true
     },
   },
   methods: {
@@ -169,7 +173,7 @@ export default {
       this.$refs.selectModal.queryParam.depotId = this.form.depotId
       this.$refs.selectModal.showModal()
     },
-    getDetailList(id) {
+    getList(id) {
       const url = '/stocktaking/detail/' + id
       const url2 = '/stocktaking/detailByItemList'
       const form = this.$refs['editForm'].form