lilei %!s(int64=2) %!d(string=hai) anos
pai
achega
0a136ac8f7

+ 6 - 6
src/views/expenseManagement/expenseReimbursement/chooseImportModal.vue

@@ -31,9 +31,9 @@
         <!-- 产品信息 -->
         <template slot="cpxx" slot-scope="text,record">
           <div v-for="item in record.detailProductsList" :key="item.id">
-            <div v-if="item.productCode">{{ item.productCode }}: ¥{{ item.expense }}</div>
-            <div v-else-if="item.productBrandName">{{ item.productBrandName }}<span v-if="item.productTypeShowName">/</span>{{ item.productTypeShowName }}: ¥{{ item.expense }}</div>
-            <div v-else>{{ item.productTypeShowName }}: ¥{{ item.expense }}</div>
+            <div v-if="item.productCode">{{ item.productCode }}</div>
+            <div v-else-if="item.productBrandName">{{ item.productBrandName }}<span v-if="item.productTypeShowName">/</span>{{ item.productTypeShowName }}</div>
+            <div v-else>{{ item.productTypeShowName }}</div>
           </div>
           <span v-if="!record.detailProductsList||record.detailProductsList.length==0">--</span>
         </template>
@@ -61,9 +61,9 @@
         <!-- 产品信息 -->
         <template slot="cpxx" slot-scope="text,record">
           <div v-for="(item,index) in record.detailProductsList" :key="item.no+'-'+index">
-            <div v-if="item.productCode">{{ item.productCode }}: ¥{{ item.expense }}</div>
-            <div v-else-if="item.productBrandName">{{ item.productBrandName }}<span v-if="item.productTypeShowName">/</span>{{ item.productTypeShowName }}: ¥{{ item.expense }}</div>
-            <div v-else>{{ item.productTypeShowName }}: ¥{{ item.expense }}</div>
+            <div v-if="item.productCode">{{ item.productCode }}</div>
+            <div v-else-if="item.productBrandName">{{ item.productBrandName }}<span v-if="item.productTypeShowName">/</span>{{ item.productTypeShowName }}</div>
+            <div v-else>{{ item.productTypeShowName }}</div>
           </div>
           <span v-if="!record.detailProductsList||record.detailProductsList.length==0">--</span>
         </template>

+ 19 - 6
src/views/purchasingManagement/bulkWarehousingOrder/productModal.vue

@@ -53,12 +53,13 @@
           <a-input-number
             id="bulkWarehousingOrder-product-productCost"
             v-model="form.productCost"
-            :disabled="!!form.productCost"
+            :disabled="true"
             :precision="2"
             :min="0"
             :max="999999"
-            placeholder="请输入"
-            style="width: 100%;" />
+            placeholder="成本价"
+            style="width: 50%;margin-right:20px;" />
+            <a-checkbox v-model="isGift">是否为赠品</a-checkbox>
         </a-form-model-item>
         <a-form-model-item label="数量" prop="productQty">
           <a-input-number
@@ -69,7 +70,7 @@
             :min="1"
             :max="999999"
             placeholder="请输入"
-            style="width: 80%;" /><span>个</span>
+            style="width: 50%;margin-right:20px;" /><span>个</span>
         </a-form-model-item>
         <div class="btn-cont">
           <a-button type="primary" id="bulkWarehousingOrder-product-modal-save" @click="handleSave">{{ itemSn?'保存':'保存并新增' }}</a-button>
@@ -128,6 +129,7 @@ export default {
         productCost: '',
         productQty: ''
       },
+      productCost:'',
       rules: {
         productSn: [
           { required: true, message: '请选择产品编码', trigger: 'change' }
@@ -136,7 +138,7 @@ export default {
           { required: true, message: '请选择仓库仓位', trigger: 'change' }
         ],
         productCost: [
-          { required: true, message: '请输入成本价', trigger: 'blur' }
+          { required: true, message: '成本价不能为空', trigger: 'blur' }
         ],
         productQty: [
           { required: true, message: '请输入数量', trigger: 'blur' }
@@ -147,7 +149,8 @@ export default {
       warehouseCascadeData: [], //  仓库仓位  下拉数据
       warehouseSnBackups: '', //  仓库备份数据
       warehouseLocationSnBackups: '', //  仓位备份数据
-      defaultWarehouseCascade: [] //  默认仓库仓位
+      defaultWarehouseCascade: [] ,//  默认仓库仓位
+      isGift: false
     }
   },
   methods: {
@@ -180,6 +183,9 @@ export default {
       this.form.productCode = this.productData[ind].product.code
       this.form.productOrigCode = this.productData[ind].product.origCode
       this.form.productCost = (this.productData[ind].cost && this.productData[ind].cost != 0) ? this.productData[ind].cost : ''
+      this.productCost = this.form.productCost
+      this.form.productQty = ''
+      this.isGift = false
       this.$refs.productQty.focus()
       this.$refs.ruleForm.validate()
     },
@@ -324,6 +330,13 @@ export default {
       if (this.isShow && newValue) {
         this.getDetail()
       }
+    },
+    isGift (newValue, oldValue){
+      if(newValue){
+        this.form.productCost = 0
+      }else{
+        this.form.productCost = this.productCost
+      }
     }
   }
 }

+ 2 - 2
vue.config.js

@@ -107,9 +107,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.0.216:8602/ocs-admin',
+        // target: 'http://192.168.0.216:8602/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
-        // target: 'http://p.ocs.360sarrow.com/ocs-admin', //  预发布
+        target: 'http://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {