瀏覽代碼

Merge branch 'develop_yh48-2' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh48-2

chenrui 8 月之前
父節點
當前提交
40cda6fb70

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1728895035513
+  "version": 1729060694982
 }

+ 1 - 1
src/views/productManagement/productBrand/editModal.vue

@@ -25,7 +25,7 @@
               :maxLength="20"
               v-model.trim="form.brandName"
               @change="filterEmpty"
-              placeholder="请输入产品品牌名称(最多20个字符)"
+              placeholder="请输入产品品牌名称(最多20个字符),名称不能含有”箭冠“、”冠牌“、”箭牌“字段!"
               allowClear />
           </a-form-model-item>
         </a-form-model>

+ 8 - 1
src/views/reportData/purchaseReceiptReport/purchaseReceiptDetail.vue

@@ -39,6 +39,11 @@
                 <a-input id="salesDetailReportList-name" v-model.trim="queryParam.productEntity.name" allowClear placeholder="请输入产品名称"/>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="供应商名称">
+                <a-input id="salesDetailReportList-purchaseTargetName" v-model.trim="queryParam.purchaseTargetName" allowClear placeholder="请输入供应商名称"/>
+              </a-form-model-item>
+            </a-col>
           </template>
           <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="purchaseReceiptDetailList-refresh">查询</a-button>
@@ -110,7 +115,8 @@ export default {
           productTypeSn3: undefined, // 分类3
           code: '', // 编码
           name: ''// 产品名称
-        }
+        },
+        purchaseTargetName: '' // 供应商名称
       },
       productType: [], // 产品类型值
       rules: {
@@ -214,6 +220,7 @@ export default {
       this.queryParam.productEntity.productTypeSn3 = ''
       this.queryParam.productEntity.code = ''
       this.queryParam.productEntity.name = ''
+      this.queryParam.purchaseTargetName = ''
       this.productType = []
       this.$refs.ruleForm.resetFields()
       this.totalData = null

+ 8 - 1
src/views/reportData/purchaseReceiptReport/purchaseReceiptOrder.vue

@@ -18,6 +18,11 @@
               <rangeDate id="purchaseReceiptDetailList-time" ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="供应商名称">
+              <a-input id="purchaseReceiptDetailList-purchaseTargetName" v-model.trim="queryParam.purchaseTargetName" allowClear placeholder="请输入供应商名称"/>
+            </a-form-model-item>
+          </a-col>
           <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="purchaseReceiptOrderList-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="purchaseReceiptOrderList-reset">重置</a-button>
@@ -75,7 +80,8 @@ export default {
       queryParam: { //  查询条件
         time: [], // 时间
         beginDate: '', // 开始时间
-        endDate: '' // 结束时间
+        endDate: '', // 结束时间
+        purchaseTargetName: '' // 供应商名称
       },
       rules: {
         'time': [{ required: true, message: '请选择财务审核时间', trigger: 'change' }]
@@ -169,6 +175,7 @@ export default {
       this.queryParam.time = []
       this.queryParam.beginDate = ''
       this.queryParam.endDate = ''
+      this.queryParam.purchaseTargetName = ''
       this.$refs.ruleForm.resetFields()
       this.totalData = null
       this.$refs.table.clearTable()

+ 10 - 10
src/views/reportData/receivedSendStorageReport/list.vue

@@ -142,17 +142,17 @@ export default {
         { title: '原厂编码', dataIndex: 'productEntity.origCode', width: 120, align: 'left', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'productEntity.unit', width: 50, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收入数量', dataIndex: 'putQty', width: 80, align: 'center', sorter: true, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '收入单价(¥)', dataIndex: 'putPrice', width: 100, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '收入金额(¥)', dataIndex: 'putAmount', width: 100, align: 'right', sorter: true, customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '发出数量', dataIndex: 'outQty', width: 80, align: 'center', sorter: true, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '发出单价(¥)', dataIndex: 'outPrice', width: 100, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '发出金额()', dataIndex: 'outAmount', width: 100, align: 'right', sorter: true, customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '结存数量', dataIndex: 'endQty', width: 80, align: 'center', sorter: true, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '结存单价(¥)', dataIndex: 'endPrice', width: 100, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '结存金额()', dataIndex: 'endAmount', width: 100, align: 'right', sorter: true, customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '收入单价', dataIndex: 'putPrice', width: 100, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '收入金额', dataIndex: 'putAmount', width: 100, align: 'right', sorter: true, customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '发出数量(含冻结)', dataIndex: 'outQty', width: 80, align: 'center', sorter: true, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '发出单价', dataIndex: 'outPrice', width: 100, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '发出金额(含冻结)', dataIndex: 'outAmount', width: 100, align: 'right', sorter: true, customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '结存数量(含冻结)', dataIndex: 'endQty', width: 80, align: 'center', sorter: true, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '结存单价', dataIndex: 'endPrice', width: 100, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '结存金额(含冻结)', dataIndex: 'endAmount', width: 100, align: 'right', sorter: true, customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '冻结数量', dataIndex: 'freezeQty', width: 80, align: 'center', sorter: true, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '冻结单价(¥)', dataIndex: 'freezePrice', width: 100, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '冻结金额(¥)', dataIndex: 'freezeAmount', width: 100, align: 'right', sorter: true, customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
+        { title: '冻结单价', dataIndex: 'freezePrice', width: 100, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '冻结金额', dataIndex: 'freezeAmount', width: 100, align: 'right', sorter: true, customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {