Merge remote-tracking branch 'origin/dev' into dev

src/views/inout/DialogCreateOrder.vue

@@ -196,7 +196,7 @@
             <el-form-item
               prop="fromCorp"
               label="往来信息:"
-              v-if="curAction.corpType == 1 && curAction.genUnit && orderQuery.billNo ==''"
+              v-if="curAction.corpType == 1 && curAction.genUnit "
             >
               <el-input
                 v-model="orderFormData.fromCorp"
@@ -207,20 +207,20 @@
                 placeholder="请输入病人住院号"
               ></el-input>
             </el-form-item>
-            <el-form-item
+<!--            <el-form-item-->
-              prop="fromCorp"
+<!--              prop="fromCorp"-->
-              label="往来信息:"
+<!--              label="往来信息:"-->
-              v-if="curAction.corpType == 1 && curAction.genUnit && orderQuery.billNo != ''"
+<!--              v-if="curAction.corpType == 1 && curAction.genUnit && orderQuery.billNo != ''"-->
-            >
+<!--            >-->
-              <el-input
+<!--              <el-input-->
-                v-model="orderFormData.fromCorpName"
+<!--                v-model="orderFormData.fromCorpName"-->
-                auto-complete="off"
+<!--                auto-complete="off"-->
-                clearable
+<!--                clearable-->
-                style="width: 90%"
+<!--                style="width: 90%"-->
-                :disabled="corpOrderIdDisabled"
+<!--                :disabled="corpOrderIdDisabled"-->
-                placeholder="请输入病人住院号"
+<!--                placeholder="请输入病人住院号"-->
-              ></el-input>
+<!--              ></el-input>-->
-            </el-form-item>
+<!--            </el-form-item>-->
           </el-col>
           <el-col :span="11">
             <el-form-item prop="remark" label="备注:">

src/views/inout/DialogcChangeNewOrder.vue

@@ -311,7 +311,8 @@ export default {
         action: this.formData.action,
         fromInvCode: this.formData.fromInvCode,
         invCode: this.formData.invCode,
-        products: products
+        products: products,
+        remark: this.formData.remark
       };
       stockOrderChange(tQuery)
         .then((response) => {

src/views/inventory/InvCountOrderModify.vue

@@ -531,6 +531,10 @@ export default {
           this.$message.warning("请先选择盘点仓库");
           return;
         }
+        if (this.codeArray.length === 0) {
+          this.$message.warning("请先录入产品");
+          return;
+        }
         //拉取整个仓库的数据
         let params = {
           invCode: this.formData.invCode,

src/views/inventory/InvCountOrderNew.vue

@@ -62,34 +62,41 @@
         </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
-            <el-button
+            <el-row>
-              type="text"
+              <el-button
-              size="small"
+                type="text"
-              @click.native.stop="printOrder(scope.row)"
+                size="small"
-            >打印
+                @click.native.stop="printOrder(scope.row)"
-            </el-button
+              >打印
-            >
+              </el-button
-            <el-button
+              >
-              type="text"
+            </el-row>
-              size="small"
+            <el-row>
-              @click.native.stop="editOrder(scope.row)"
+              <el-button
-            >编辑
+                type="text"
-            </el-button
+                size="small"
-            >
+                @click.native.stop="editOrder(scope.row)"
-            <el-button
+              >编辑
-              type="text"
+              </el-button
-              size="small"
+              >
-              @click.native.stop="submitAudit(scope.row)"
+            </el-row>
-            >提交审核
+            <el-row>
-            </el-button
+              <el-button
-            >
+                type="text"
-            <el-button
+                size="small"
-              type="text"
+                @click.native.stop="submitAudit(scope.row)"
-              size="small"
+              >提交审核
-              @click.native.stop="deleteDialog(scope.row.id)"
+              </el-button
-            >删除
+              >
-            </el-button
+            </el-row>
-            >
+            <el-row>
+              <el-button
+                type="text"
+                size="small"
+                @click.native.stop="deleteDialog(scope.row.id)"
+              >删除
+              </el-button>
+            </el-row>
           </template>
         </el-table-column>
       </el-table>