11月14日 库存扣减更新

src/views/layout/Layout.vue

@@ -16,10 +16,10 @@
           <i class="iconfont icon-computer_fill navIcon"></i>
           <p>透析管理</p>
         </div>
-        <!-- <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
-          <i class="iconfont icon-kccx navIcon"></i>
-          <p>采购管理</p>
-        </div> -->
+<!--        <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">-->
+<!--          <i class="iconfont icon-kccx navIcon"></i>-->
+<!--          <p>采购管理</p>-->
+<!--        </div>-->
         <div v-if="kucunShow" :class="index == 3 ? 'navOne navActive' : 'navOne'" @click="clickActive(3,'库房管理')">
           <i class="iconfont icon-kccx navIcon"></i>
           <p>库房管理</p>

src/xt_pages/supply/components/addGoodOrder.vue

@@ -187,7 +187,7 @@
     </el-table-column>
     <el-table-column label="生产厂家" align="center" width="200px">
         <template slot-scope="scope">
-         <el-select size="small" v-model="scope.row.supply_manufacturer" filterable placeholder="请选择厂家" :disabled="true">
+         <el-select size="small" v-model="scope.row.supply_manufacturer" filterable  :disabled="true">
                 <el-option
                   v-for="(option, index) in manufactuerList"
                   :key="index"

src/xt_pages/supply/components/addPurchaseOrder.vue

@@ -113,7 +113,7 @@
                   v-model="scope.row.name"
                   style="width: 160px"
                   filterable
-                  placeholder="请选择"
+                  placeholder="请选择商品"
                   @change="changeName"
                   @input="changeGoodName(scope.$index)"
                   :disabled="disabled"
@@ -138,6 +138,7 @@
                 v-model="scope.row.supply_type"
                 style="width: 120px"
                 :disabled="true"
+                 placeholder="商品类别"
               ></el-input>
               <div style="visibility: hidden">/</div>
             </template>
@@ -145,6 +146,7 @@
           <el-table-column label="规格&单位" align="center" width="200px">
             <template slot-scope="scope">
               <el-input
+                placeholder="规格&单位"
                 v-model="scope.row.supply_specification_name"
                 style="width: 150px"
                 :disabled="true"
@@ -197,6 +199,7 @@
               <el-form-item
                 :prop="'tableList.' + scope.$index + '.supply_count'"
                 :rules="tableRules.supply_count"
+                 placeholder="请输入数量"
               >
                 <el-input
                   v-model="scope.row.supply_count"
@@ -207,12 +210,13 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="购货单价" align="center" width="120px">
+          <el-table-column label="购货单价" align="center" width="140px">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.supply_price"
                 style="width: 80px"
                 :disabled="disabled"
+                 placeholder="请输入购货单价"
               ></el-input>
               <div style="visibility: hidden">/</div>
             </template>
@@ -230,7 +234,6 @@
                 size="small"
                 v-model="scope.row.supply_manufacturer"
                 filterable
-                placeholder="请选择生产厂家"
                 :disabled="true"
               >
                 <el-option
@@ -262,6 +265,7 @@
                 v-model="scope.row.supply_remake"
                 style="width: 160px"
                 :disabled="disabled"
+                placeholder="请输入备注"
               ></el-input>
               <div style="visibility: hidden">/</div>
             </template>
@@ -316,6 +320,7 @@
             style="width: 100px"
             v-model="rate_of_concession"
             @input="addressChange"
+            @placeholder="请输入优惠率"
           ></el-input
           >%</span
         >
@@ -324,6 +329,7 @@
           >优惠金额:<el-input
             style="width: 100px"
             v-model="discount_amount"
+            @placeholder="请输入优惠金额"
           ></el-input
         ></span>
       </div>

src/xt_pages/supply/components/editGoodOrder.vue

@@ -187,7 +187,7 @@
     </el-table-column>
     <el-table-column label="生产厂家" align="center" width="200px">
         <template slot-scope="scope">
-         <el-select size="small" v-model="scope.row.supply_manufacturer" filterable placeholder="请选择厂家" :disabled="true">
+         <el-select size="small" v-model="scope.row.supply_manufacturer" filterable  :disabled="true">
                 <el-option
                   v-for="(option, index) in manufactuerList"
                   :key="index"
@@ -834,7 +834,8 @@ getTimes(time) {
           this.$message.success("反审核成功!")
         }
         if(msg == 2){
-          this.$message.success("该单有自动出库或生成了退货单,反审核失败!")
+          this.$message.error("该单有自动出库或生成了退货单,反审核失败!")
+          
         }
 
         var purcaseOrder = response.data.data.purcaseOrder

src/xt_pages/supply/components/editPurchaseOrder.vue

@@ -132,7 +132,7 @@
         </template>
         <template slot-scope="scope">
           <el-form-item  :prop="'tableList.' + scope.$index + '.supply_count'" :rules='tableRules.supply_count'>
-             <el-input v-model="scope.row.supply_count" style="width:80px" :disabled="disabled"></el-input>
+             <el-input v-model="scope.row.supply_count" style="width:80px" :disabled="disabled" placeholder="请输入数量"></el-input>
           </el-form-item>
         </template>
     </el-table-column>
@@ -151,7 +151,7 @@
 
     <el-table-column label="生产厂家" align="center" width="200px">
         <template slot-scope="scope">
-           <el-select size="small" v-model="scope.row.supply_manufacturer" filterable placeholder="请选择厂家" :disabled="true">
+           <el-select size="small" v-model="scope.row.supply_manufacturer" filterable :disabled="true">
                 <el-option
                   v-for="(option, index) in manufactuerList"
                   :key="index"