Переглянути джерело

Merge branch 'develop_yh11' of jianguan-web/jg-ocs-html into develop_yh12

李磊 2 роки тому
батько
коміт
58a825bfe0

+ 1 - 1
src/views/allocationManagement/transferOut/list.vue

@@ -135,7 +135,7 @@
           <a-button
             size="small"
             type="link"
-            v-if="record.state == 'WAIT_AUDIT'&&record.printState=='UNABLE_PRINT' && $hasPermissions('B_tfo_yxPrint')"
+            v-if="record.state == 'WAIT_AUDIT' && record.printState!='UNABLE_PRINT' && $hasPermissions('B_tfo_yxPrint')"
             class="button-warning"
             @click="handleYxPrint(record)"
             id="allocateBillList-examine-btn">允许打印</a-button>

+ 29 - 24
src/views/allocationManagement/transferOut/printStatusModal.vue

@@ -12,26 +12,24 @@
         id="chooseCustom-form"
         ref="ruleForm"
         :model="form"
+        :rules="rules"
         :label-col="formItemLayout.labelCol"
         :wrapper-col="formItemLayout.wrapperCol">
-        <a-form-model-item label="调拨单号:" prop="no"> <span>{{ form.no }}{{ form.printState=='UNABLE_PRINT'?'(暂不打印)':form.printStatus=='CANCEL_PRINT'?'(取消打印)':'' }}</span>
+        <a-form-model-item label="调拨单号:" prop="no">
+          <span>{{ form.no }}{{ form.printState == 'UNABLE_PRINT' ? '(暂不打印)' : form.printState == 'CANCEL_PRINT' ? '(取消打印)' : '' }}</span>
         </a-form-model-item>
-        <a-form-model-item label="调往对象:" prop="targetName"> <span>{{ form.targetName }}</span>
+        <a-form-model-item label="调往对象:" prop="targetName">
+          <span>{{ form.targetName }}</span>
         </a-form-model-item>
-        <a-form-model-item label="调拨打印:" prop="printState">
-          <a-radio-group v-model="printState">
-            <a-radio value="NO_PRINT">
-              允许打印
-            </a-radio>
-            <a-radio value="CANCEL_PRINT" v-if="form.printState=='UNABLE_PRINT'">
-              取消打印
-            </a-radio>
+        <a-form-model-item label="调拨打印:" prop="printStateInfo">
+          <a-radio-group v-model="form.printStateInfo">
+            <a-radio value="NO_PRINT">允许打印</a-radio>
+            <a-radio value="CANCEL_PRINT" v-if="form.printState == 'UNABLE_PRINT'">取消打印</a-radio>
           </a-radio-group>
         </a-form-model-item>
         <a-form-model-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;margin-top: 50px;">
           <a-button @click="cancel" style="margin-right: 15px" id="chooseCustom-btn-back">取消</a-button>
-          <a-button type="primary" :loading="confirmLoading" @click="handleSubmit" id="chooseCustom-btn-submit">确定
-          </a-button>
+          <a-button type="primary" :loading="confirmLoading" @click="handleSubmit" id="chooseCustom-btn-submit">确定</a-button>
         </a-form-model-item>
       </a-form-model>
     </a-spin>
@@ -39,9 +37,7 @@
 </template>
 
 <script>
-import {
-  updatePrintState
-} from '@/api/allocateBill.js'
+import { updatePrintState } from '@/api/allocateBill.js'
 export default {
   name: 'PrintModal',
   props: {
@@ -72,18 +68,29 @@ export default {
         no: undefined,
         payerName: undefined,
         printStatus: '',
-        allocateSn: ''
+        allocateSn: '',
+        printStateInfo: ''
       },
-      printState: ''
+      rules: { printStateInfo: [{ required: true, message: '请选择调拨打印状态', trigger: 'change' }] }
     }
   },
   methods: {
     //  保存
     handleSubmit () {
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          this.handleSave()
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    },
+    handleSave () {
       const _this = this
       const ajax_form = {
-        allocateSn: this.form.allocateSn,
-        printState: this.printState
+        allocateSn: _this.form.allocateSn,
+        printState: _this.form.printStateInfo
       }
       _this.spinning = true
       _this.confirmLoading = true
@@ -101,7 +108,7 @@ export default {
     cancel () {
       this.opened = false
       this.$emit('cancel')
-      this.printState = ''
+      this.form.printStateInfo = ''
       this.$refs.ruleForm.resetFields()
     }
   },
@@ -118,9 +125,7 @@ export default {
 }
 </script>
 <style lang="less" scoped>
-#chooseCustom-form{
-.chooseCustom-form{
-  margin-bottom:0 !important;
-}
+.ant-form-item {
+  margin-bottom: 0px !important;
 }
 </style>

+ 2 - 2
src/views/financialManagement/warehousingConfirmation/list.vue

@@ -87,8 +87,8 @@
         </div>
       </div>
       <div class="btn-box">
-        <a-button type="primary" class="button-error" @click="handleConfirmationFail">不通过</a-button>
-        <a-button type="primary" class="button-info" @click="handleConfirmationOk">通过</a-button>
+        <a-button type="primary" :loading="spinning" class="button-error" @click="handleConfirmationFail">不通过</a-button>
+        <a-button type="primary" :loading="spinning" class="button-info" @click="handleConfirmationOk">通过</a-button>
       </div>
     </a-modal>
   </a-card>

+ 2 - 2
src/views/productManagement/productInfo/chooseImportModal.vue

@@ -100,7 +100,7 @@ export default {
         { title: '单位', dataIndex: 'unit', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '包装数', dataIndex: 'packQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '包装数单位', dataIndex: 'packQtyUnit', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '是否箭冠产品', dataIndex: 'arrowFalgDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '是否箭冠产品', dataIndex: 'arrow', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '条形码', dataIndex: 'qrCode', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品尺寸', dataIndex: 'size', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '产品重量', dataIndex: 'weight', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -123,7 +123,7 @@ export default {
         { title: '单位', dataIndex: 'unit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '包装数', dataIndex: 'packQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '包装数单位', dataIndex: 'packQtyUnit', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '是否箭冠产品', dataIndex: 'arrowFalgDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '是否箭冠产品', dataIndex: 'arrow', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '条形码', dataIndex: 'qrCode', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品尺寸', dataIndex: 'size', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '产品重量', dataIndex: 'weight', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },

+ 2 - 2
src/views/salesManagement/salesCollection/detailModal.vue

@@ -12,7 +12,7 @@
     <a-spin :spinning="spinning" tip="Loading...">
       <div class="common-main">
         <div class="toolsBar">
-          <!-- <div v-if="handlePlData.length">{{ handlePlData[0].settleClientName }},共 {{ handlePlData && handlePlData.length }} 个备货单,合计 {{ totalAmount }} 元,已选择 {{ chooseData.length }} 个收款单</div> -->
+          <div v-if="handlePlData.length">{{ handlePlData[0].settleClientName }},共 {{ handlePlData && handlePlData.length }} 个备货单,合计 {{ totalAmount }} 元,已选择 {{ chooseData.length }} 个收款单</div>
           <a-button type="primary" class="button-primary" @click="handleCommonOk">{{ okText }}</a-button>
         </div>
         <div>
@@ -284,7 +284,7 @@ export default {
         status: 'AUDIT_PASS'
       }
       this.orginData = []
-      this.$nextTick(()=>{
+      this.$nextTick(() => {
         this.$refs.rangeApply.resetDate()
         this.$refs.table.refresh(true)
       })