Merge remote-tracking branch 'origin/20201109_pc_vue_new_branch' into 20201109_pc_vue_new_branch

src/xt_pages/data/components/consumables.vue

@@ -334,6 +334,7 @@
               total:"",
               register_number:"",
               is_user:"2",
+              number:"",
             },
             isVisibility: false,
           }
@@ -568,15 +569,12 @@
               response.data.data.goodInfo.good_type_id;
 
 
-            this.goodInfo.goodInfoDialog.formValue.good_name =
-              response.data.data.goodInfo.good_name;
+            this.goodInfo.goodInfoDialog.formValue.good_name = response.data.data.goodInfo.good_name;
 
 
-            this.goodInfo.goodInfoDialog.formValue.pinyin =
-              response.data.data.goodInfo.pinyin;
+            this.goodInfo.goodInfoDialog.formValue.pinyin = response.data.data.goodInfo.pinyin;
 
-            this.goodInfo.goodInfoDialog.formValue.wubi =
-              response.data.data.goodInfo.wubi;
+            this.goodInfo.goodInfoDialog.formValue.wubi = response.data.data.goodInfo.wubi;
 
 
 
@@ -731,7 +729,8 @@
             this.goodInfo.goodInfoDialog.formValue.packing_price = response.data.data.goodInfo.packing_price
             this.goodInfo.goodInfoDialog.formValue.default_count_unit = response.data.data.goodInfo.default_count_unit
             this.goodInfo.goodInfoDialog.formValue.register_number = response.data.data.goodInfo.register_number
-
+            
+            this.goodInfo.goodInfoDialog.formValue.number = response.data.data.goodInfo.number
            
             this.goodInfo.goodInfoDialog.formValue.is_user = response.data.data.goodInfo.is_user.toString()
             

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -211,6 +211,10 @@
               </el-select>
              </el-form-item>
 
+            <el-form-item label="批准文号:" >
+              <el-input v-model="form.number" style="width:180px"></el-input>
+            </el-form-item>
+
 
             <el-form-item label="备注 : " prop="name" style="width:100%;">
               <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
@@ -383,6 +387,7 @@
           total:"",
           register_number:"",
           is_user:"2",
+          number:"",
         },
 
         rules: {
@@ -610,6 +615,7 @@
         form["total"] = this.form.total
         form["register_number"] = this.form.register_number
         form["is_user"] = this.form.is_user
+        form["number"] = this.form.number
 
         return form
       }, changeSelected: function(val) {

src/xt_pages/stock/stockQuery.vue

@@ -113,7 +113,7 @@
        </el-table-column>
        <el-table-column label="出库数量" align="center" v-if="showOne">
          <template slot-scope="scope">
-          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779 || org_id == 10106 || org_id == 9504 || org_id ==  10215 || org_id ==  10088 || org_id == 10191 || org_id == 9919 || org_id == 10265 || org_id == 10164 || org_id ==10290 ">
+          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779 || org_id == 10106 || org_id == 9504 || org_id ==  10215 || org_id ==  10188 || org_id == 10191 || org_id == 9919 || org_id == 10265 || org_id == 10164 || org_id ==10290 ">
              <span>
               {{getWareInfo(scope.row.xt_warehouse_info) - getOverFlushInfo(scope.row.xt_warehouse_info)}}
             </span>
@@ -124,7 +124,7 @@
       
         <el-table-column label="剩余库存量" align="center" v-if="showThree">
          <template slot-scope="scope">
-          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779 || org_id == 10106 || org_id == 9504 || org_id ==  10215 || org_id == 10088 || org_id == 10191 || org_id == 9919 || org_id == 10265 || org_id == 10164 || org_id == 10290">
+          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779 || org_id == 10106 || org_id == 9504 || org_id ==  10215 || org_id == 10188 || org_id == 10191 || org_id == 9919 || org_id == 10265 || org_id == 10164 || org_id == 10290">
             {{getOverFlushInfo(scope.row.xt_warehouse_info)}}
           </span>
           <span v-else>{{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) - getOutCount(scope.row.id) + getCancelCount(scope.row.id) }}</span>

src/xt_pages/supply/components/addGoodOrder.vue

@@ -645,7 +645,7 @@ export default {
             goodList[i].supply_count = "";
             goodList[i].supply_total_price = "";
             goodList[i].supply_manufacturer = goodList[i].manufacturer;
-            goodList[i].supply_license_number = "";
+            goodList[i].supply_license_number = goodList[i].number;
             goodList[i].supply_remake = "";
             goodList[i].type = 2;
             goodList[i].name = goodList[i].good_name;

src/xt_pages/supply/components/addGoodReturn.vue

@@ -537,7 +537,7 @@ export default {
             goodList[i].supply_count = "";
             goodList[i].supply_total_price = "";
             goodList[i].supply_manufacturer = goodList[i].manufacturer;
-            goodList[i].supply_license_number = "";
+            goodList[i].supply_license_number = goodList[i].number;
             goodList[i].supply_remake = "";
             goodList[i].type = 2;
             goodList[i].name = goodList[i].good_name;

src/xt_pages/supply/components/addPurchaseOrder.vue

@@ -507,7 +507,7 @@ export default {
         goodList[i].supply_count = ""
         goodList[i].supply_total_price = ""
         goodList[i].supply_manufacturer = goodList[i].manufacturer
-        goodList[i].supply_license_number = ""
+        goodList[i].supply_license_number = goodList[i].number
         goodList[i].supply_remake = ""
         goodList[i].type = 2
         goodList[i].name = goodList[i].good_name
@@ -716,7 +716,7 @@ export default {
       var min_str = "";
       if (arr.length > 0) {
         for (let i = 0; i < arr.length; i++) {
-          total += parseInt(arr[i].stock_max_number);
+          total += parseInt(arr[i].stock_max_number+arr[i].stock_min_number);
         }
       }
       if (total < min_number) {

src/xt_pages/supply/components/editGoodOrder.vue

@@ -18,6 +18,7 @@
             v-model="supplier_name"
             style="width: 140px; margin-right: 10px"
             placeholder="请选择"
+            :disabled="disabled"
           >
             <el-option
               v-for="item in supplyList"
@@ -39,6 +40,7 @@
             align="right"
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
+            :disabled="disabled"
           ></el-date-picker>
           <!-- <span>交货日期:</span> -->
           <!-- <el-date-picker
@@ -213,6 +215,7 @@
                   placeholder="选择日期时间"
                   format="yyyy-MM-dd"
                   value-format="yyyy-MM-dd"
+                  :disabled="disabled"
                 >
                 </el-date-picker>
               </el-form-item>
@@ -272,6 +275,7 @@
               <el-form-item
                 :prop="'tableList.' + scope.$index + '.supply_product_date'"
                 :rules="tableRules.supply_product_date"
+                
               >
                 <el-date-picker
                   prefix-icon="el-icon-date"
@@ -281,6 +285,7 @@
                   placeholder="选择日期时间"
                   format="yyyy-MM-dd"
                   value-format="yyyy-MM-dd"
+                  :disabled="disabled"
                 >
                 </el-date-picker>
               </el-form-item>
@@ -384,6 +389,7 @@
             :rows="2"
             placeholder="备注信息"
             v-model="return_remark"
+           :disabled="disabled"
           >
           </el-input>
         </div>
@@ -396,6 +402,7 @@
             v-model="rate_of_concession"
             @input="addressChange"
             placeholder="请输入优惠率"
+            :disabled="disabled"
           ></el-input
           >%</span
         >
@@ -406,6 +413,7 @@
             v-model="discount_amount"
             @input="count_discount"
             placeholder="请输入优惠金额"
+            :disabled="disabled"
           ></el-input
         ></span>
 
@@ -415,6 +423,7 @@
             v-model="payment"
             @input="count_payment"
             placeholder="请输入本次付款"
+            :disabled="disabled"
           ></el-input
         ></span>
 
@@ -424,6 +433,7 @@
             v-model="arrearage"
             @input="count_arrearage"
             placeholder="请输入本次欠款"
+            :disabled="disabled"
           ></el-input
         ></span>
       </div>
@@ -623,7 +633,7 @@ export default {
             goodList[i].supply_count = "";
             goodList[i].supply_total_price = "";
             goodList[i].supply_manufacturer = goodList[i].manufacturer;
-            goodList[i].supply_license_number = "";
+            goodList[i].supply_license_number = goodList[i].number;
             goodList[i].supply_remake = "";
             goodList[i].type = 2;
             goodList[i].name = goodList[i].good_name;
@@ -858,6 +868,7 @@ export default {
             this.showOne = false;
             this.showTwo = true;
             this.showThree = true;
+            this.disabled = true
           }
 
           this.id = out.id;

src/xt_pages/supply/components/editGoodReturn.vue

@@ -542,7 +542,7 @@ export default {
             goodList[i].supply_count = "";
             goodList[i].supply_total_price = "";
             goodList[i].supply_manufacturer = goodList[i].manufacturer;
-            goodList[i].supply_license_number = "";
+            goodList[i].supply_license_number = goodList[i].number;
             goodList[i].supply_remake = "";
             goodList[i].type = 2;
             goodList[i].name = goodList[i].good_name;

src/xt_pages/supply/components/editPurchaseOrder.vue

@@ -557,7 +557,7 @@ export default {
             goodList[i].supply_count = "";
             goodList[i].supply_total_price = "";
             goodList[i].supply_manufacturer = goodList[i].manufacturer;
-            goodList[i].supply_license_number = "";
+            goodList[i].supply_license_number = goodList[i].number
             goodList[i].supply_remake = "";
             goodList[i].type = 2;
             goodList[i].name = goodList[i].good_name;

src/xt_pages/supply/purchaseOrderQuery.vue

@@ -258,7 +258,6 @@ export default {
       return uParseTime(time, '{y}-{m}-{d}')
      },
      getlist(){
-        console.log("hhhhhh",this.end_time)
         var params = {
           check_id:this.check_id,
           start_time:this.start_time,